Major update for pthreads, based in large part on improvements

from glibc 2.3.  This should make threads much more efficient.
 -Erik

46 files changed, 571 insertions, 136 deletions

diff --git a/libpthread/linuxthreads_db/Banner b/libpthread/linuxthreads_db/Banner
new file mode 100644
index 000000000..6f4f3f818
--- /dev/null
+++ b/libpthread/linuxthreads_db/Banner
@@ -0,0 +1 @@
+libthread_db work sponsored by Alpha Processor Inc
diff --git a/libpthread/linuxthreads_db/ChangeLog b/libpthread/linuxthreads_db/ChangeLog
index 4d29ae0bb..a366d657c 100644
--- a/libpthread/linuxthreads_db/ChangeLog
+++ b/libpthread/linuxthreads_db/ChangeLog
@@ -1,10 +1,198 @@
+2002-09-29  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_thr_tsd.c (td_thr_tsd): Read correct entry from pthread_keys
+	array.
+
+2002-09-28  Andreas Jaeger  <aj@suse.de>
+
+	* td_thr_tls_get_addr.c (td_thr_tls_get_addr): Fix reference to dtv.
+
+2002-09-24  Roland McGrath  <roland@redhat.com>
+
+	* td_thr_tls_get_addr.c (td_thr_tls_get_addr): Fetch just the
+	individual members we need, not the whole structures.
+
+2002-09-24  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_thr_tls_get_addr.c (td_thr_tls_get_addr): Change second
+	parameter to be the address of the link map in the inferior process.
+	* thread_db.h: Update prototype for td_thr_tls_get_addr.
+
+2002-08-23  Ulrich Drepper  <drepper@redhat.com>
+
+	* thread_dbP.h: Define LINUXTHREADS_VERSION.
+	* td_symbol_list.c (symbol_list_arr): Add LINUXTHREADS_VERSION string.
+	* td_ta_new.c (td_ta_new): After verifying the thread library is
+	there check version.
+	* thread_db.h: Add new error TD_VERSION.
+
+2002-08-21  Roland McGrath  <roland@redhat.com>
+
+	* td_thr_tls_get_addr.c (td_thr_tls_get_addr): __attribute_used__ ->
+	__attribute__ ((unused)) for arguments.
+
+2002-08-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* thread_dbP.h: Define LINUXTHREADS_INITIAL_REPORT_EVENTS.
+	* td_thr_event_enable.c (td_thr_event_enable): If th->th_unique is
+	null write to __linuxthreads_initial_report_events.
+	* td_symbol_list.c (symbol_list_arr): Add
+	__linuxthreads_initial_report_events.
+
+2002-07-16  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_thr_clear_event.c: Yet more changes to help with TLS-enabled
+	libpthread.
+	* td_thr_event_enable.c: Likewise.
+	* td_thr_event_getmsg.c: Likewise.
+	* td_thr_set_event.c: Likewise.
+	* td_thr_setfpregs.c: Likewise.
+	* td_thr_setgregs.c: Likewise.
+	* td_thr_tsd.c: Likewise.
+	* td_thr_validate.c: Likewise.
+
+2002-07-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_ta_thr_iter.c: Some more changes to enable using TLS-enabled
+	libpthread.
+	* td_thr_event_enable.c: Likewise.
+	* td_thr_getfpregs.c: Likewise.
+	* td_thr_getgregs.c: Likewise.
+
+2002-07-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_ta_map_id2thr.c: Begin fixing implementation for libpthread with
+	TLS support.
+	* td_ta_map_lwp2thr.c: Likewise.
+	* td_ta_thr_iter.c: Likewise.
+	* td_thr_get_info.c: Likewise.
+
+2002-07-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* Versions [libthread_db] (GLIBC_2.3): Add td_thr_tls_get_addr.
+
+2002-06-14  H.J. Lu  <hjl@gnu.org>
+
+	* td_thr_tls_get_addr.c (td_thr_tls_get_addr): Don't include
+	"tls.h". Return TD_ERR if USE_TLS is not defined.
+
+2002-06-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_thr_tls_get_addr.c: New file.
+	* thread_db.h: Add prototype for td_thr_tls_get_addr.
+	* Makefile (libthread_db-routines): Add td_thr_tls_get_addr.
+
+2002-03-03  Andreas Jaeger  <aj@suse.de>
+
+	* thread_dbP.h: Include <unistd.h> for prototypes of __libc_write.
+
+2002-02-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* thread_dbP.h: Include descr.h instead of internals.h.
+	* td_ta_event_getmsg.c: Also include <linuxthreads/internals.h>.
+	* td_ta_map_id2thr.c: Likewise.
+	* td_ta_map_lwp2thr.c: Likewise.
+	* td_ta_thr_iter.c: Likewise.
+	* td_ta_tsd_iter.c: Likewise.
+	* td_thr_tsd.c: Likewise.
+	* td_thr_validate.c: Likewise.
+
+2001-12-28  Andreas Jaeger  <aj@suse.de>
+
+	* 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  <drepper@redhat.com>
+
+	* td_ta_map_id2thr.c: If thread terminated return TD_NOTHR.
+	* td_thr_validate.c: Likewise.
+
+2001-04-04  Ulrich Drepper  <drepper@redhat.com>
+
+	* td_thr_getfpregs.c: If p_pid is zero use ps_getpid().
+	* td_thr_getgregs.c: Likewise.
+	* td_thr_setfpregs.c: Likewise.
+	* td_thr_setgregs.c: Likewise.
+
+2001-03-20  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makefile (libthread_db-routines): Add td_symbol_list.
+	* Versions [libthread_db] (GLIBC_2.2.3): Add td_symbol_list.
+	* td_symbol_list.c: New file.
+	* thread_db.h: Add prototype for td_symbol_list.
+	* thread_dbP.h: Define symbol name indices.
+	Add prototype for td_lookup.
+	* td_ta_event_addr.c: Use td_lookup instead of directly using
+	ps_pglobal_lookup to find symbol address.
+	* td_ta_get_nthreads.c: Likewise.
+	* td_ta_new.c: Likewise.
+
+2001-03-18  Ulrich Drepper  <drepper@redhat.com>
+
+	* Makefile: When generating DSO link with libc_nonshared.a.
+
+2000-08-01  Andreas Jaeger  <aj@suse.de>
+
+	* Makefile (distribute): Add missing files.
+
+2000-04-24  Mark Kettenis  <kettenis@gnu.org>
+
+	* td_thr_get_info.c (td_thr_get_info): Set ti_state to
+	TD_THR_ACTIVE instead of TD_THR_RUN.  If the thread is no longer
+	running but is still joinable, set it to TD_THR_ZOMBIE.  Otherwise
+	set it to TD_THR_UNKNOWN.
+
+2000-02-25  Andreas Jaeger  <aj@suse.de>
+
+	* td_ta_thr_iter.c: Include <alloca.h> for prototype declaration.
+	* td_ta_tsd_iter.c: Likewise.
+
+2000-01-20  Andreas Jaeger  <aj@suse.de>
+
+	* td_thr_getgregs.c (td_thr_getgregs): Fix typo.
+
 2000-01-19  Ulrich Drepper  <drepper@cygnus.com>
 
 	* td_thr_getgregs.c: Correct size parameter of memset call.
 
 1999-12-02  Ulrich Drepper  <drepper@cygnus.com>
 
-	* proc_service.h: Fix typoes in last added declaractions.
+	* proc_service.h: Fix typos in last added declaractions.
 
 1999-12-01  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/libpthread/linuxthreads_db/Makefile b/libpthread/linuxthreads_db/Makefile
index ec3637bb4..d5d3ec5c9 100644
--- a/libpthread/linuxthreads_db/Makefile
+++ b/libpthread/linuxthreads_db/Makefile
@@ -39,18 +39,21 @@ SYSDEPINC = -I$(PTDIR)sysdeps/unix/sysv/linux \
             -I$(TOPDIR)libc/sysdeps/linux/$(TARGET_ARCH)
 CFLAGS += $(SYSDEPINC) -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
 
-CSRC=td_init.c td_log.c td_ta_clear_event.c td_ta_delete.c \
-	td_ta_enable_stats.c td_ta_event_addr.c td_ta_event_getmsg.c \
-	td_ta_get_nthreads.c td_ta_get_ph.c td_ta_get_stats.c \
-	td_ta_map_id2thr.c td_ta_map_lwp2thr.c td_ta_new.c td_ta_reset_stats.c \
-	td_ta_set_event.c td_ta_setconcurrency.c td_ta_thr_iter.c \
-	td_ta_tsd_iter.c td_thr_clear_event.c td_thr_dbresume.c \
-	td_thr_dbsuspend.c td_thr_event_enable.c td_thr_event_getmsg.c \
-	td_thr_get_info.c td_thr_getfpregs.c td_thr_getgregs.c \
-	td_thr_getxregs.c td_thr_getxregsize.c td_thr_set_event.c \
-	td_thr_setfpregs.c td_thr_setgregs.c td_thr_setprio.c \
-	td_thr_setsigpending.c td_thr_setxregs.c td_thr_sigsetmask.c \
-	td_thr_tsd.c td_thr_validate.c td_symbol_list.c
+CSRC=	td_init.c td_log.c td_ta_delete.c td_ta_get_nthreads.c		\
+	td_ta_get_ph.c td_ta_map_id2thr.c td_ta_map_lwp2thr.c		\
+	td_ta_new.c td_ta_thr_iter.c td_ta_tsd_iter.c			\
+	td_thr_get_info.c td_thr_getfpregs.c td_thr_getgregs.c		\
+	td_thr_getxregs.c td_thr_getxregsize.c td_thr_setfpregs.c	\
+	td_thr_setgregs.c td_thr_setprio.c td_thr_setsigpending.c	\
+	td_thr_setxregs.c td_thr_sigsetmask.c td_thr_tsd.c		\
+	td_thr_validate.c td_thr_dbsuspend.c td_thr_dbresume.c		\
+	td_ta_setconcurrency.c td_ta_enable_stats.c			\
+	td_ta_reset_stats.c td_ta_get_stats.c td_ta_event_addr.c	\
+	td_thr_event_enable.c td_thr_set_event.c			\
+	td_thr_clear_event.c td_thr_event_getmsg.c			\
+	td_ta_set_event.c td_ta_event_getmsg.c				\
+	td_ta_clear_event.c td_symbol_list.c td_thr_tls_get_addr.c
+
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
diff --git a/libpthread/linuxthreads_db/Versions b/libpthread/linuxthreads_db/Versions
index 83b30ee6e..4ca8042c1 100644
--- a/libpthread/linuxthreads_db/Versions
+++ b/libpthread/linuxthreads_db/Versions
@@ -12,4 +12,10 @@ libthread_db {
     td_thr_setprio; td_thr_setsigpending; td_thr_setxregs; td_thr_sigsetmask;
     td_thr_tsd; td_thr_validate;
   }
+  GLIBC_2.2.3 {
+    td_symbol_list;
+  }
+  GLIBC_2.3 {
+    td_thr_tls_get_addr;
+  }
 }
diff --git a/libpthread/linuxthreads_db/proc_service.h b/libpthread/linuxthreads_db/proc_service.h
index 8f9a7d98f..74136c03e 100644
--- a/libpthread/linuxthreads_db/proc_service.h
+++ b/libpthread/linuxthreads_db/proc_service.h
@@ -2,19 +2,19 @@
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Library General Public License for more details.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Library General Public
-   License along with the GNU C Library; see the file COPYING.LIB.  If not,
-   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, write to the Free
+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+   02111-1307 USA.  */
 
 /* The definitions in this file must correspond to those in the debugger.  */
 #include <sys/procfs.h>
diff --git a/libpthread/linuxthreads_db/td_init.c b/libpthread/linuxthreads_db/td_init.c
index 6c4dfc623..d714f1ba0 100644
--- a/libpthread/linuxthreads_db/td_init.c
+++ b/libpthread/linuxthreads_db/td_init.c
@@ -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 <drepper@cygnus.com>, 1999.
 
@@ -27,6 +27,6 @@ td_err_e
 td_init (void)
 {
   /* XXX We have to figure out what has to be done.  */
-  LOG (__FUNCTION__);
+  LOG ("td_init");
   return TD_OK;
 }
diff --git a/libpthread/linuxthreads_db/td_log.c b/libpthread/linuxthreads_db/td_log.c
index 2007eaacc..025273a63 100644
--- a/libpthread/linuxthreads_db/td_log.c
+++ b/libpthread/linuxthreads_db/td_log.c
@@ -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 <drepper@cygnus.com>, 1999.
 
@@ -25,8 +25,8 @@ td_err_e
 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;
 }
diff --git a/libpthread/linuxthreads_db/td_symbol_list.c b/libpthread/linuxthreads_db/td_symbol_list.c
index 61072dbf1..779332b9d 100644
--- a/libpthread/linuxthreads_db/td_symbol_list.c
+++ b/libpthread/linuxthreads_db/td_symbol_list.c
@@ -1,5 +1,5 @@
 /* Return list of symbols the library can request.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001.
 
@@ -24,29 +24,33 @@
 
 static const char *symbol_list_arr[] =
 {
-    [PTHREAD_THREADS_EVENTS] = "__pthread_threads_events",
-    [PTHREAD_LAST_EVENT] = "__pthread_last_event",
-    [PTHREAD_HANDLES_NUM] = "__pthread_handles_num",
-    [PTHREAD_HANDLES] = "__pthread_handles",
-    [PTHREAD_KEYS] = "pthread_keys",
-    [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max",
-    [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max",
-    [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr",
-    [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event",
-    [LINUXTHREADS_DEATH_EVENT] = "__linuxthreads_death_event",
-    [LINUXTHREADS_REAP_EVENT] = "__linuxthreads_reap_event",
-    [NUM_MESSAGES] = NULL
+  [PTHREAD_THREADS_EVENTS] = "__pthread_threads_events",
+  [PTHREAD_LAST_EVENT] = "__pthread_last_event",
+  [PTHREAD_HANDLES_NUM] = "__pthread_handles_num",
+  [PTHREAD_HANDLES] = "__pthread_handles",
+  [PTHREAD_KEYS] = "pthread_keys",
+  [LINUXTHREADS_PTHREAD_THREADS_MAX] = "__linuxthreads_pthread_threads_max",
+  [LINUXTHREADS_PTHREAD_KEYS_MAX] = "__linuxthreads_pthread_keys_max",
+  [LINUXTHREADS_PTHREAD_SIZEOF_DESCR] = "__linuxthreads_pthread_sizeof_descr",
+  [LINUXTHREADS_CREATE_EVENT] = "__linuxthreads_create_event",
+  [LINUXTHREADS_DEATH_EVENT] = "__linuxthreads_death_event",
+  [LINUXTHREADS_REAP_EVENT] = "__linuxthreads_reap_event",
+  [LINUXTHREADS_INITIAL_REPORT_EVENTS] = "__linuxthreads_initial_report_events",
+  [LINUXTHREADS_VERSION] = "__linuxthreads_version",
+  [NUM_MESSAGES] = NULL
 };
 
 
-const char ** td_symbol_list (void)
+const char **
+td_symbol_list (void)
 {
-    return symbol_list_arr;
+  return symbol_list_arr;
 }
 
 
-int td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr)
+int
+td_lookup (struct ps_prochandle *ps, int idx, psaddr_t *sym_addr)
 {
-    assert (idx >= 0 && idx < NUM_MESSAGES);
-    return ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], sym_addr);
+  assert (idx >= 0 && idx < NUM_MESSAGES);
+  return ps_pglobal_lookup (ps, LIBPTHREAD_SO, symbol_list_arr[idx], sym_addr);
 }
diff --git a/libpthread/linuxthreads_db/td_ta_clear_event.c b/libpthread/linuxthreads_db/td_ta_clear_event.c
index fc7fde135..bdbcf47aa 100644
--- a/libpthread/linuxthreads_db/td_ta_clear_event.c
+++ b/libpthread/linuxthreads_db/td_ta_clear_event.c
@@ -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 <drepper@cygnus.com>, 1999.
 
@@ -29,7 +29,7 @@ td_ta_clear_event (ta, 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 --git a/libpthread/linuxthreads_db/td_ta_delete.c b/libpthread/linuxthreads_db/td_ta_delete.c
index 5d235630d..0e6ec17d0 100644
--- a/libpthread/linuxthreads_db/td_ta_delete.c
+++ b/libpthread/linuxthreads_db/td_ta_delete.c
@@ -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 <drepper@cygnus.com>, 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)
diff --git a/libpthread/linuxthreads_db/td_ta_enable_stats.c b/libpthread/linuxthreads_db/td_ta_enable_stats.c
index 5a6fef7ee..1d4c34a8d 100644
--- a/libpthread/linuxthreads_db/td_ta_enable_stats.c
+++ b/libpthread/linuxthreads_db/td_ta_enable_stats.c
@@ -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 <drepper@cygnus.com>, 1999.
 
@@ -25,7 +25,7 @@ td_err_e
 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 --git a/libpthread/linuxthreads_db/td_ta_event_addr.c b/libpthread/linuxthreads_db/td_ta_event_addr.c
index 4f0f7bbf1..8bce35ae8 100644
--- a/libpthread/linuxthreads_db/td_ta_event_addr.c
+++ b/libpthread/linuxthreads_db/td_ta_event_addr.c
@@ -27,7 +27,7 @@ td_ta_event_addr (const td_thragent_t *ta, td_event_e event, td_notify_t *addr)
   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))
diff --git a/libpthread/linuxthreads_db/td_ta_event_getmsg.c b/libpthread/linuxthreads_db/td_ta_event_getmsg.c
index a63a3d0a7..ec68ae0e2 100644
--- a/libpthread/linuxthreads_db/td_ta_event_getmsg.c
+++ b/libpthread/linuxthreads_db/td_ta_event_getmsg.c
@@ -1,5 +1,5 @@
 /* Retrieve event.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999.
 
@@ -22,6 +22,7 @@
 #include <string.h>
 
 #include "thread_dbP.h"
+#include "../linuxthreads/internals.h"
 
 
 td_err_e
@@ -32,7 +33,7 @@ td_ta_event_getmsg (const td_thragent_t *ta, td_event_msg_t *msg)
   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 --git a/libpthread/linuxthreads_db/td_ta_get_nthreads.c b/libpthread/linuxthreads_db/td_ta_get_nthreads.c
index f275a25e7..839b56be5 100644
--- a/libpthread/linuxthreads_db/td_ta_get_nthreads.c
+++ b/libpthread/linuxthreads_db/td_ta_get_nthreads.c
@@ -25,7 +25,7 @@ td_ta_get_nthreads (const td_thragent_t *ta, int *np)
 {
   psaddr_t addr;
 
-  LOG (__FUNCTION__);
+  LOG ("td_ta_get_nthreads");
 
   /* Test whether the TA parameter is ok.  */
   if (! ta_ok (ta))
diff --git a/libpthread/linuxthreads_db/td_ta_get_ph.c b/libpthread/linuxthreads_db/td_ta_get_ph.c
index e08d52137..23d328508 100644
--- a/libpthread/linuxthreads_db/td_ta_get_ph.c
+++ b/libpthread/linuxthreads_db/td_ta_get_ph.c
@@ -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 <drepper@cygnus.com>, 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))
diff --git a/libpthread/linuxthreads_db/td_ta_get_stats.c b/libpthread/linuxthreads_db/td_ta_get_stats.c
index 9aa049c3e..6bf2f5352 100644
--- a/libpthread/linuxthreads_db/td_ta_get_stats.c
+++ b/libpthread/linuxthreads_db/td_ta_get_stats.c
@@ -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 <drepper@cygnus.com>, 1999.