glibc-2.2.5-allow-gcc-3.4-td.patch

linux下编译交叉工具链的工具源码

Fixes following error building glibc-2.2.5 with gcc-3.4:
td_init.c: In function `td_init':
td_init.c:30: error: parse error before string constant
td_init.c:30: error: parse error before string constant
make[2]: *** [/home/dank/wk/crosstool-0.28-rc4h/build/i686-unknown-linux-gnu/gcc-3.4.0-20040406-glibc-2.2.5/build-glibc/linuxthreads_db/td_init.os] Error 1

# Retrieved by diffing a +-1 day rng around the time mentioned
# in http://sources.redhat.com/ml/glibc-cvs/2001-q4/msg00654.html
# cvs -z 9 -d :pserver:[e-mail]:/cvs/glibc diff -u -D"2001-12-27 08:41:30" -D"2001-12-29 08:41:32"
# then fixing paths.

Index: ChangeLog
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- libc/linuxthreads_db/ChangeLog	13 Apr 2001 00:09:54 -0000	1.41
+++ libc/linuxthreads_db/ChangeLog	29 Dec 2001 00:59:58 -0000	1.42
@@ -1,3 +1,43 @@
[phone]  Andreas Jaeger  <[e-mail]>
+
+	* td_init.c (td_init): Don't use __FUNCTION__ as literal.
+	* td_log.c (td_log): Likewise.
+	* td_ta_delete.c (td_ta_delete): Likewise.
+	* td_ta_get_nthreads.c (td_ta_get_nthreads): Likewise.
+	* td_ta_get_ph.c (td_ta_get_ph): Likewise.
+	* td_ta_map_id2thr.c (td_ta_map_id2thr): Likewise.
+	* td_ta_map_lwp2thr.c (td_ta_map_lwp2thr): Likewise.
+	* td_ta_new.c (td_ta_new): Likewise.
+	* td_ta_clear_event.c (td_ta_clear_event): Likewise.
+	* td_ta_enable_stats.c (td_ta_enable_stats): Likewise.
+	* td_ta_event_addr.c (td_ta_event_addr): Likewise.
+	* td_ta_event_getmsg.c (td_ta_event_getmsg): Likewise.
+	* td_ta_get_stats.c (td_ta_get_stats): Likewise.
+	* td_ta_reset_stats.c (td_ta_reset_stats): Likewise.
+	* td_ta_set_event.c (td_ta_set_event): Likewise.
+	* td_ta_setconcurrency.c (td_ta_setconcurrency): Likewise.
+	* td_ta_thr_iter.c (td_ta_thr_iter): Likewise.
+	* td_ta_tsd_iter.c (td_ta_tsd_iter): Likewise.
+	* td_thr_clear_event.c (td_thr_clear_event): Likewise.
+	* td_thr_dbresume.c (td_thr_dbresume): Likewise.
+	* td_thr_dbsuspend.c (td_thr_dbsuspend): Likewise.
+	* td_thr_event_enable.c (td_thr_event_enable): Likewise.
+	* td_thr_event_getmsg.c (td_thr_event_getmsg): Likewise.
+	* td_thr_get_info.c (td_thr_get_info): Likewise.
+	* td_thr_getfpregs.c (td_thr_getfpregs): Likewise.
+	* td_thr_getgregs.c (td_thr_getgregs): Likewise.
+	* td_thr_getxregs.c (td_thr_getxregs): Likewise.
+	* td_thr_getxregsize.c (td_thr_getxregsize): Likewise.
+	* td_thr_set_event.c (td_thr_set_event): Likewise.
+	* td_thr_setfpregs.c (td_thr_setfpregs): Likewise.
+	* td_thr_setgregs.c (td_thr_setgregs): Likewise.
+	* td_thr_setprio.c (td_thr_setprio): Likewise.
+	* td_thr_setsigpending.c (td_thr_setsigpending): Likewise.
+	* td_thr_setxregs.c (td_thr_setxregs): Likewise.
+	* td_thr_sigsetmask.c (td_thr_sigsetmask): Likewise.
+	* td_thr_tsd.c (td_thr_tsd): Likewise.
+	* td_thr_validate.c (td_thr_validate): Likewise.
+
 2001-04-12  Ulrich Drepper  <[e-mail]>
 
 	* td_ta_map_id2thr.c: If thread terminated return TD_NOTHR.
Index: td_init.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_init.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_init.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_init.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Initialization function of thread debugger support library.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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;
 }
Index: td_log.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_log.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libc/linuxthreads_db/td_log.c	6 Jul 2001 05:27:23 -0000	1.2
+++ libc/linuxthreads_db/td_log.c	28 Dec 2001 16:41:29 -0000	1.3
@@ -1,5 +1,5 @@
 /* Noop, left for historical reasons.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -25,8 +25,8 @@
 td_log (void)
 {
   /* This interface is deprecated in the Sun interface.  We provide it
-     for compatibility but don't do anyhting ourself.  We might in
+     for compatibility but don't do anything ourself.  We might in
      future do some logging if this seems reasonable.  */
-  LOG (__FUNCTION__);
+  LOG ("td_log");
   return TD_OK;
 }
Index: td_ta_clear_event.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_clear_event.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_ta_clear_event.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_ta_clear_event.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Globally disable events.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -29,7 +29,7 @@
   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))
Index: td_ta_delete.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_delete.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_ta_delete.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_ta_delete.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Detach to target process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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)
Index: td_ta_enable_stats.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_enable_stats.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_ta_enable_stats.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_ta_enable_stats.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Enable collection of statistics for process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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))
Index: td_ta_event_addr.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_event_addr.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libc/linuxthreads_db/td_ta_event_addr.c	6 Jul 2001 05:27:23 -0000	1.5
+++ libc/linuxthreads_db/td_ta_event_addr.c	28 Dec 2001 16:41:29 -0000	1.6
@@ -27,7 +27,7 @@
   td_err_e res = TD_NOEVENT;
   int idx = -1;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_event_addr");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
Index: td_ta_event_getmsg.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_event_getmsg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libc/linuxthreads_db/td_ta_event_getmsg.c	6 Jul 2001 05:27:23 -0000	1.5
+++ libc/linuxthreads_db/td_ta_event_getmsg.c	28 Dec 2001 16:41:29 -0000	1.6
@@ -1,5 +1,5 @@
 /* Retrieve event.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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))
Index: td_ta_get_nthreads.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_get_nthreads.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libc/linuxthreads_db/td_ta_get_nthreads.c	6 Jul 2001 05:27:23 -0000	1.5
+++ libc/linuxthreads_db/td_ta_get_nthreads.c	28 Dec 2001 16:41:29 -0000	1.6
@@ -25,7 +25,7 @@
 {
   psaddr_t addr;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_get_nthreads");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
Index: td_ta_get_ph.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_get_ph.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_ta_get_ph.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_ta_get_ph.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Get external process handle.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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))
Index: td_ta_get_stats.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_get_stats.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libc/linuxthreads_db/td_ta_get_stats.c	6 Jul 2001 05:27:23 -0000	1.3
+++ libc/linuxthreads_db/td_ta_get_stats.c	28 Dec 2001 16:41:29 -0000	1.4
@@ -1,5 +1,5 @@
 /* Retrieve statistics for process.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <[e-mail]>, 1999.
 
@@ -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))
Index: td_ta_map_id2thr.c
===================================================================
RCS file: /cvs/glibc/libc/linuxthreads_db/td_ta_map_id2thr.c,v
retrieving revision 1.4