diff options
| author | Roland McGrath <roland@gnu.org> | 2003-03-02 11:45:12 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2003-03-02 11:45:12 +0000 |
| commit | bb0ddc2f1eca652aa8af56825b2ba3182498cc5a (patch) | |
| tree | 8b03305facff745ff0bd14c50e811dfd77cef343 /linuxthreads_db | |
| parent | 3093b1c70cd227c3329d2bbb77cd59ce2cbdcbd4 (diff) | |
| download | glibc-bb0ddc2f1eca652aa8af56825b2ba3182498cc5a.tar glibc-bb0ddc2f1eca652aa8af56825b2ba3182498cc5a.tar.gz glibc-bb0ddc2f1eca652aa8af56825b2ba3182498cc5a.tar.bz2 glibc-bb0ddc2f1eca652aa8af56825b2ba3182498cc5a.zip | |
* sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_fixup_plt):
Don't use weak_extern for dl_rtld_map. Instead check only if [SHARED].
(elf_machine_rela): Clean up.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Clean up.
PowerPC TLS support contributed by Paul Mackerras <paulus@samba.org>.
* sysdeps/powerpc/powerpc32/elf/configure.in: New file.
* sysdeps/powerpc/powerpc32/elf/configure: New generated file.
* elf/tls-macros.h [__powerpc__ && !__powerpc64__]
(TLS_LE, TLS_IE, TLS_LD, TLS_GD): Define them.
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Support
new relocs for TLS.
* sysdeps/powerpc/dl-tls.h (TLS_TP_OFFSET, TLS_DTV_OFFSET): Move these
macros out of [SHARED].
(TLS_TPREL_VALUE, TLS_DTPREL_VALUE): New macros.
* elf/elf.h: Define R_PPC_* relocs for TLS support.
Clean up R_PPC64_* macro definition comments.
Diffstat (limited to 'linuxthreads_db')
| -rw-r--r-- | linuxthreads_db/ChangeLog | 7 | ||||
| -rw-r--r-- | linuxthreads_db/td_ta_thr_iter.c | 4 | ||||
| -rw-r--r-- | linuxthreads_db/td_thr_tls_get_addr.c | 19 |
3 files changed, 23 insertions, 7 deletions
diff --git a/linuxthreads_db/ChangeLog b/linuxthreads_db/ChangeLog index 3a4d50e772..45cdf4a9ff 100644 --- a/linuxthreads_db/ChangeLog +++ b/linuxthreads_db/ChangeLog @@ -1,3 +1,10 @@ +2003-02-27 Roland McGrath <roland@redhat.com> + + * td_thr_tls_get_addr.c (td_thr_tls_get_addr): Handle TLS_DTV_AT_TP. + + * td_ta_thr_iter.c (handle_descr) [!defined USE_TLS || !TLS_DTV_AT_TP]: + Conditionalize p_header use on this. + 2003-01-29 Roland McGrath <roland@redhat.com> * td_ta_new.c (td_ta_new): Cap the `sizeof_descr' value read from the diff --git a/linuxthreads_db/td_ta_thr_iter.c b/linuxthreads_db/td_ta_thr_iter.c index ee83c82ee9..9ab04e14e3 100644 --- a/linuxthreads_db/td_ta_thr_iter.c +++ b/linuxthreads_db/td_ta_thr_iter.c @@ -1,5 +1,5 @@ /* Iterate over a process's threads. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999,2000,2001,2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1999. @@ -40,7 +40,9 @@ handle_descr (const td_thragent_t *ta, td_thr_iter_f *callback, memset (&pds, '\0', sizeof (pds)); /* Empty thread descriptor the thread library would create. */ +#if !defined USE_TLS || !TLS_DTV_AT_TP pds.p_header.data.self = &pds; +#endif pds.p_nextlive = pds.p_prevlive = &pds; pds.p_tid = PTHREAD_THREADS_MAX; /* The init code also sets up p_lock, p_errnop, p_herrnop, and diff --git a/linuxthreads_db/td_thr_tls_get_addr.c b/linuxthreads_db/td_thr_tls_get_addr.c index e140b77dc1..223fa663fc 100644 --- a/linuxthreads_db/td_thr_tls_get_addr.c +++ b/linuxthreads_db/td_thr_tls_get_addr.c @@ -1,5 +1,5 @@ /* Get address of thread local variable. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2002. @@ -18,8 +18,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ - -#include "link.h" +#include <stddef.h> +#include <link.h> #include "thread_dbP.h" /* Value used for dtv entries for which the allocation is delayed. */ @@ -38,10 +38,17 @@ td_thr_tls_get_addr (const td_thrhandle_t *th __attribute__ ((unused)), LOG ("td_thr_tls_get_addr"); + psaddr_t dtvpp = th->th_unique; +#if TLS_TCB_AT_TP + dtvpp += offsetof (struct _pthread_descr_struct, p_header.data.dtvp); +#elif TLS_DTV_AT_TP + dtvpp += TLS_PRE_TCB_SIZE + offsetof (tcbhead_t, dtv); +#else +# error "Either TLS_TCB_AT_TP or TLS_DTV_AT_TP must be defined." +#endif + /* Get the DTV pointer from the thread descriptor. */ - if (ps_pdread (th->th_ta_p->ph, - &((struct _pthread_descr_struct *) th->th_unique)->p_header.data.dtvp, - &dtvp, sizeof dtvp) != PS_OK) + if (ps_pdread (th->th_ta_p->ph, dtvpp, &dtvp, sizeof dtvp) != PS_OK) return TD_ERR; /* XXX Other error value? */ /* Read the module ID from the link_map. */ |