summaryrefslogtreecommitdiff
path: root/patches/glibc/linuxthreads-2.2.2/glibc-linuxthreads-2.2.2-allow-gcc3.patch
blob: 7719e5e49741d26ff553004e9943124f31bce4bf (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
Fixes
td_init.c:30: error: parse error before string constant
td_init.c:30: error: parse error before string constant

From http://sources.redhat.com/ml/crossgcc/2005-01/msg00106.html :
---
Date: Mon, 31 Jan 2005 10:27:32 -0800
Message-ID: <BF124E1E7928E546B5705D93C699ABDC0C7E99@glimmer.glimmerglassnet.com>
From: "Vince Chen" <chen at glimmerglass dot com>
To: <crossgcc at sources dot redhat dot com>

I needed to build glibc-2.2.2 using gcc-3.x to support
some of our older redhat machines.

This file patches glibc-linuxthreads-2.2.2.

When using crosstool, I placed it in:

   patches/glibc-linuxthreads-2.2.2/linuxthreads-gcc3.patch

(you also need the glibc-gcc3.patch)

-vince
---
[removed parts already in threadparam.patch]

===================================================================
--- glibc-2.2.2/linuxthreads_db.orig/td_init.c	1999-11-22 12:52:34.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_init.c	2005-01-27 19:05:36.000000000 -0800
@@ -27,6 +27,6 @@
 td_init (void)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_init");
   return TD_OK;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_log.c glibc-2.2.2/linuxthreads_db/td_log.c
--- glibc-2.2.2/linuxthreads_db.orig/td_log.c	1999-10-07 23:31:32.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_log.c	2005-01-27 19:05:29.000000000 -0800
@@ -27,6 +27,6 @@
   /* This interface is deprecated in the Sun interface.  We provide it
      for compatibility but don't do anyhting ourself.  We might in
      future do some logging if this seems reasonable.  */
-  LOG (__FUNCTION__);
+  LOG ("td_log");
   return TD_OK;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_clear_event.c glibc-2.2.2/linuxthreads_db/td_ta_clear_event.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_clear_event.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_clear_event.c	2005-01-27 19:05:20.000000000 -0800
@@ -22,14 +22,12 @@
 
 
 td_err_e
-td_ta_clear_event (ta, event)
-     const td_thragent_t *ta;
-     td_thr_events_t *event;
+td_ta_clear_event (const td_thragent_t *ta, td_thr_events_t *event)
 {
   td_thr_events_t old_event;
   int i;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_clear_event");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_delete.c glibc-2.2.2/linuxthreads_db/td_ta_delete.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_delete.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_delete.c	2005-01-27 19:04:59.000000000 -0800
@@ -26,7 +26,7 @@
 td_err_e
 td_ta_delete (td_thragent_t *ta)
 {
-  LOG (__FUNCTION__);
+  LOG ("td_ta_delete");
 
   /* Safety check.  */
   if (ta == NULL || __td_agent_list == NULL)
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_enable_stats.c glibc-2.2.2/linuxthreads_db/td_ta_enable_stats.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_enable_stats.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_enable_stats.c	2005-01-27 19:04:50.000000000 -0800
@@ -25,7 +25,7 @@
 td_ta_enable_stats (const td_thragent_t *ta, int enable)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_ta_enable_stats");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_event_addr.c glibc-2.2.2/linuxthreads_db/td_ta_event_addr.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_event_addr.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_event_addr.c	2005-01-27 19:04:41.000000000 -0800
@@ -29,7 +29,7 @@
   td_err_e res = TD_NOEVENT;
   const char *symbol = NULL;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_event_addr");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_event_getmsg.c glibc-2.2.2/linuxthreads_db/td_ta_event_getmsg.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_event_getmsg.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_event_getmsg.c	2005-01-27 19:04:33.000000000 -0800
@@ -32,7 +32,7 @@
   td_eventbuf_t event;
   psaddr_t addr;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_event_getmsg");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_get_nthreads.c glibc-2.2.2/linuxthreads_db/td_ta_get_nthreads.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_get_nthreads.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_get_nthreads.c	2005-01-27 19:04:25.000000000 -0800
@@ -26,7 +26,7 @@
 {
   psaddr_t addr;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_get_nthreads");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_get_ph.c glibc-2.2.2/linuxthreads_db/td_ta_get_ph.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_get_ph.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_get_ph.c	2005-01-27 19:04:17.000000000 -0800
@@ -24,7 +24,7 @@
 td_err_e
 td_ta_get_ph (const td_thragent_t *ta, struct ps_prochandle **ph)
 {
-  LOG (__FUNCTION__);
+  LOG ("td_ta_get_ph");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_get_stats.c glibc-2.2.2/linuxthreads_db/td_ta_get_stats.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_get_stats.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_get_stats.c	2005-01-27 19:04:06.000000000 -0800
@@ -25,7 +25,7 @@
 td_ta_get_stats (const td_thragent_t *ta, td_ta_stats_t *statsp)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_ta_get_stats");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_map_id2thr.c glibc-2.2.2/linuxthreads_db/td_ta_map_id2thr.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_map_id2thr.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_map_id2thr.c	2005-01-27 19:03:54.000000000 -0800
@@ -28,7 +28,7 @@
   struct _pthread_descr_struct pds;
   int pthread_threads_max;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_map_id2thr");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_map_lwp2thr.c glibc-2.2.2/linuxthreads_db/td_ta_map_lwp2thr.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_map_lwp2thr.c	1999-11-22 18:25:26.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_map_lwp2thr.c	2005-01-27 19:03:46.000000000 -0800
@@ -34,7 +34,7 @@
 # define num 1
 #endif
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_map_lwp2thr");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_new.c glibc-2.2.2/linuxthreads_db/td_ta_new.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_new.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_new.c	2005-01-27 19:03:36.000000000 -0800
@@ -36,7 +36,7 @@
   psaddr_t addr;
   struct agent_list *elemp;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_new");
 
   /* Get the global event mask.  This is one of the variables which
      are new in the thread library to enable debugging.  If it is
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_reset_stats.c glibc-2.2.2/linuxthreads_db/td_ta_reset_stats.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_reset_stats.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_reset_stats.c	2005-01-27 19:03:27.000000000 -0800
@@ -25,7 +25,7 @@
 td_ta_reset_stats (const td_thragent_t *ta)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_ta_reset_stats");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_set_event.c glibc-2.2.2/linuxthreads_db/td_ta_set_event.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_set_event.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_set_event.c	2005-01-27 19:03:15.000000000 -0800
@@ -22,14 +22,12 @@
 
 
 td_err_e
-td_ta_set_event (ta, event)
-     const td_thragent_t *ta;
-     td_thr_events_t *event;
+td_ta_set_event (const td_thragent_t *ta, td_thr_events_t *event)
 {
   td_thr_events_t old_event;
   int i;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_set_event");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_setconcurrency.c glibc-2.2.2/linuxthreads_db/td_ta_setconcurrency.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_setconcurrency.c	1999-11-08 14:52:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_setconcurrency.c	2005-01-27 19:02:48.000000000 -0800
@@ -25,7 +25,7 @@
 td_ta_setconcurrency (const td_thragent_t *ta, int level)
 {
   /* This is something LinuxThreads does not support.  */
-  LOG (__FUNCTION__);
+  LOG ("td_ta_setconcurrency");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_thr_iter.c glibc-2.2.2/linuxthreads_db/td_ta_thr_iter.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_thr_iter.c	2000-02-28 12:34:06.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_thr_iter.c	2005-01-27 19:02:39.000000000 -0800
@@ -86,7 +86,7 @@
 # define num 1
 #endif
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_thr_iter");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_ta_tsd_iter.c glibc-2.2.2/linuxthreads_db/td_ta_tsd_iter.c
--- glibc-2.2.2/linuxthreads_db.orig/td_ta_tsd_iter.c	2000-02-28 12:34:06.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_ta_tsd_iter.c	2005-01-27 19:02:29.000000000 -0800
@@ -29,7 +29,7 @@
   int pthread_keys_max;
   int cnt;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_tsd_iter");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_clear_event.c glibc-2.2.2/linuxthreads_db/td_thr_clear_event.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_clear_event.c	1999-11-03 10:37:18.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_clear_event.c	2005-01-27 19:02:19.000000000 -0800
@@ -24,14 +24,12 @@
 
 
 td_err_e
-td_thr_clear_event (th, event)
-     const td_thrhandle_t *th;
-     td_thr_events_t *event;
+td_thr_clear_event (const td_thrhandle_t *th, td_thr_events_t *event)
 {
   td_thr_events_t old_event;
   int i;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_clear_event");
 
   /* Write the new value into the thread data structure.  */
   if (ps_pdread (th->th_ta_p->ph,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_dbresume.c glibc-2.2.2/linuxthreads_db/td_thr_dbresume.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_dbresume.c	1999-10-07 23:40:02.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_dbresume.c	2005-01-27 19:01:54.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_dbresume (const td_thrhandle_t *th)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_dbresume");
   return TD_NOCAPAB;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_dbsuspend.c glibc-2.2.2/linuxthreads_db/td_thr_dbsuspend.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_dbsuspend.c	1999-10-07 23:40:33.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_dbsuspend.c	2005-01-27 19:01:46.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_dbsuspend (const td_thrhandle_t *th)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_dbsuspend");
   return TD_NOCAPAB;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_event_enable.c glibc-2.2.2/linuxthreads_db/td_thr_event_enable.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_event_enable.c	1999-11-02 16:06:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_event_enable.c	2005-01-27 19:01:35.000000000 -0800
@@ -24,11 +24,9 @@
 
 
 td_err_e
-td_thr_event_enable (th, onoff)
-     const td_thrhandle_t *th;
-     int onoff;
+td_thr_event_enable (const td_thrhandle_t *th, int onoff)
 {
-  LOG (__FUNCTION__);
+  LOG ("td_thr_event_enable");
 
   /* Write the new value into the thread data structure.  */
   if (ps_pdwrite (th->th_ta_p->ph,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_event_getmsg.c glibc-2.2.2/linuxthreads_db/td_thr_event_getmsg.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_event_getmsg.c	1999-11-02 16:06:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_event_getmsg.c	2005-01-27 19:01:11.000000000 -0800
@@ -29,7 +29,7 @@
 {
   td_eventbuf_t event;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_event_getmsg");
 
   /* Read the even structure from the target.  */
   if (ps_pdread (th->th_ta_p->ph,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_get_info.c glibc-2.2.2/linuxthreads_db/td_thr_get_info.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_get_info.c	2000-05-01 14:56:42.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_get_info.c	2005-01-27 19:00:59.000000000 -0800
@@ -29,7 +29,7 @@
 {
   struct _pthread_descr_struct pds;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_get_info");
 
   /* Get the thread descriptor.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_getfpregs.c glibc-2.2.2/linuxthreads_db/td_thr_getfpregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_getfpregs.c	1999-11-02 16:06:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_getfpregs.c	2005-01-27 19:00:49.000000000 -0800
@@ -26,7 +26,7 @@
 {
   struct _pthread_descr_struct pds;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_getfpregs");
 
   /* We have to get the state and the PID for this thread.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_getgregs.c glibc-2.2.2/linuxthreads_db/td_thr_getgregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_getgregs.c	2000-02-11 15:48:51.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_getgregs.c	2005-01-27 19:00:37.000000000 -0800
@@ -26,7 +26,7 @@
 {
   struct _pthread_descr_struct pds;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_getgregs");
 
   /* We have to get the state and the PID for this thread.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_getxregs.c glibc-2.2.2/linuxthreads_db/td_thr_getxregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_getxregs.c	1999-10-07 23:46:09.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_getxregs.c	2005-01-27 19:00:26.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_getxregs (const td_thrhandle_t *th, void *xregs)
 {
   /* XXX This might be platform specific.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_getxregs");
   return TD_NOXREGS;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_getxregsize.c glibc-2.2.2/linuxthreads_db/td_thr_getxregsize.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_getxregsize.c	1999-10-07 23:46:33.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_getxregsize.c	2005-01-27 19:00:16.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_getxregsize (const td_thrhandle_t *th, int *sizep)
 {
   /* XXX This might be platform specific.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_getxregsize");
   return TD_NOXREGS;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_set_event.c glibc-2.2.2/linuxthreads_db/td_thr_set_event.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_set_event.c	1999-11-03 10:37:18.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_set_event.c	2005-01-27 19:00:08.000000000 -0800
@@ -24,14 +24,12 @@
 
 
 td_err_e
-td_thr_set_event (th, event)
-     const td_thrhandle_t *th;
-     td_thr_events_t *event;
+td_thr_set_event (const td_thrhandle_t *th, td_thr_events_t *event)
 {
   td_thr_events_t old_event;
   int i;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_set_event");
 
   /* Write the new value into the thread data structure.  */
   if (ps_pdread (th->th_ta_p->ph,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_setfpregs.c glibc-2.2.2/linuxthreads_db/td_thr_setfpregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_setfpregs.c	1999-11-02 16:06:10.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_setfpregs.c	2005-01-27 18:59:06.000000000 -0800
@@ -26,7 +26,7 @@
 {
   struct _pthread_descr_struct pds;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_setfpregs");
 
   /* We have to get the state and the PID for this thread.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_setgregs.c glibc-2.2.2/linuxthreads_db/td_thr_setgregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_setgregs.c	2000-02-11 15:48:51.000000000 -0800
+++ glibc-2.2.2/linuxthreads_db/td_thr_setgregs.c	2005-01-27 18:58:57.000000000 -0800
@@ -26,7 +26,7 @@
 {
   struct _pthread_descr_struct pds;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_setgregs");
 
   /* We have to get the state and the PID for this thread.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_setprio.c glibc-2.2.2/linuxthreads_db/td_thr_setprio.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_setprio.c	1999-10-07 23:49:11.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_setprio.c	2005-01-27 18:58:46.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_setprio (const td_thrhandle_t *th, int prio)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_setprio");
   return TD_OK;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_setsigpending.c glibc-2.2.2/linuxthreads_db/td_thr_setsigpending.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_setsigpending.c	1999-10-07 23:49:38.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_setsigpending.c	2005-01-27 18:58:34.000000000 -0800
@@ -26,6 +26,6 @@
 		      const sigset_t *ss)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_setsigpending");
   return TD_OK;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_setxregs.c glibc-2.2.2/linuxthreads_db/td_thr_setxregs.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_setxregs.c	1999-10-07 23:48:20.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_setxregs.c	2005-01-27 18:58:21.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_setxregs (const td_thrhandle_t *ta, const void *addr)
 {
   /* XXX This might have to be platform specific.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_setxregs");
   return TD_NOXREGS;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_sigsetmask.c glibc-2.2.2/linuxthreads_db/td_thr_sigsetmask.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_sigsetmask.c	1999-10-07 23:50:34.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_sigsetmask.c	2005-01-27 18:57:58.000000000 -0800
@@ -25,6 +25,6 @@
 td_thr_sigsetmask (const td_thrhandle_t *th, const sigset_t *ss)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_thr_sigsetmask");
   return TD_OK;
 }
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_tsd.c glibc-2.2.2/linuxthreads_db/td_thr_tsd.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_tsd.c	1999-10-07 23:52:15.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_tsd.c	2005-01-27 18:58:09.000000000 -0800
@@ -33,7 +33,7 @@
   unsigned int idx2nd;
   void *p;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_tsd");
 
   /* Get the thread descriptor.  */
   if (ps_pdread (th->th_ta_p->ph, th->th_unique, &pds,
diff -ru glibc-2.2.2/linuxthreads_db.orig/td_thr_validate.c glibc-2.2.2/linuxthreads_db/td_thr_validate.c
--- glibc-2.2.2/linuxthreads_db.orig/td_thr_validate.c	1999-10-14 17:24:20.000000000 -0700
+++ glibc-2.2.2/linuxthreads_db/td_thr_validate.c	2005-01-27 18:57:41.000000000 -0800
@@ -28,7 +28,7 @@
   int pthread_threads_max = th->th_ta_p->pthread_threads_max;
   int cnt;
 
-  LOG (__FUNCTION__);
+  LOG ("td_thr_validate");
 
   /* Now get all descriptors, one after the other.  */
   for (cnt = 0; cnt < pthread_threads_max; ++cnt, ++handles)