2003-09-05 Roland McGrath <roland@redhat.com>

	* pthread_create.c (__pthread_pthread_sizeof_descr): Removed.
	Instead, include ../nptl_db/db_info.c to do its magic.
	* pthread_key_create.c (__pthread_pthread_keys_max): Removed.
	(__pthread_pthread_key_2ndlevel_size): Likewise.
	* sysdeps/alpha/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/i386/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/ia64/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/powerpc/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/s390/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/sh/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/sparc/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/x86_64/tls.h (DB_THREAD_SELF): New macro.
	* sysdeps/alpha/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/generic/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/i386/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/ia64/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/powerpc/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/s390/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/sh/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/sparc/td_ta_map_lwp2thr.c: File removed.
	* sysdeps/x86_64/td_ta_map_lwp2thr.c: File removed.

diff --git a/sysdeps/alpha/nptl/td_ta_map_lwp2thr.c b/sysdeps/alpha/nptl/td_ta_map_lwp2thr.c
deleted file mode 100644 (file)
index b30b10b..0000000
--- a/sysdeps/alpha/nptl/td_ta_map_lwp2thr.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Which thread is running on an LWP?  PowerPC version.
-   Copyright (C) 2003 Free Software Foundation, Inc.
-   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 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
-   Lesser General Public License for more details.
-
-   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.  */
-
-#include "thread_dbP.h"
-#include <tls.h>
-
-
-td_err_e
-td_ta_map_lwp2thr (const td_thragent_t *ta, lwpid_t lwpid, td_thrhandle_t *th)
-{
-  LOG ("td_ta_map_lwp2thr");
-
-  /* Test whether the TA parameter is ok.  */
-  if (! ta_ok (ta))
-    return TD_BADTA;
-
-  prgregset_t regs;
-  if (ps_lgetregs (ta->ph, lwpid, regs) != PS_OK)
-    return TD_ERR;
-
-  /* The uniq value is stored in slot 33 in recent gdb; it isn't stored
-     anywhere otherwise.  */
-  th->th_unique = ((void *) regs[32]
-                  - TLS_TCB_OFFSET - TLS_TCB_SIZE - TLS_PRE_TCB_SIZE);
-
-  /* Found it.  Now complete the `td_thrhandle_t' object.  */
-  th->th_ta_p = (td_thragent_t *) ta;
-
-  return TD_OK;
-}

diff --git a/sysdeps/alpha/nptl/tls.h b/sysdeps/alpha/nptl/tls.h
index 1718b3e..8f61bb7 100644 (file)
--- a/sysdeps/alpha/nptl/tls.h
+++ b/sysdeps/alpha/nptl/tls.h
@@ -118,6 +118,10 @@ typedef struct
     ((struct pthread *) (__builtin_thread_pointer () \
                         - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE))
 
+/* Magic for libthread_db to know how to do THREAD_SELF.  */
+# define DB_THREAD_SELF \
+  REGISTER (64, 32 * 8, - TLS_TCB_OFFSET - TLS_PRE_TCB_SIZE)
+
 /* Identifier for the current thread.  THREAD_SELF is usable but
    sometimes more expensive than necessary as in this case.  */
 # define THREAD_ID (__builtin_thread_pointer ())