diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/i386/tls.h | 4 | ||||
| -rw-r--r-- | linuxthreads/sysdeps/ia64/tls.h | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 3 | ||||
| -rw-r--r-- | nptl/sysdeps/ia64/tls.h | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/dl-static.c | 4 |
7 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index 23732dacfa..68a9ea47fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-03-07 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/ia64/dl-static.c (_dl_static_init): Call + _dl_lookup_symbol_x not _dl_lookup_symbol. + * sysdeps/powerpc/elf/rtld-global-offsets.sym: Adjust for moving _dl_hwcap into _rtld_global_ro. * sysdeps/powerpc/powerpc32/fpu/__longjmp-common.S: Likewise. diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index e7d0902cc8..9f11a40548 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2004-03-07 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/i386/tls.h (INIT_SYSINFO): _dl_sysinfo is now in + _rtlf_global_ro. + * sysdeps/ia64/tls.h (INIT_SYSINFO): Likewise. + 2004-02-20 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/unix/sysv/linux/powerpc/ptlongjmp.c [SHARED]: Code only diff --git a/linuxthreads/sysdeps/i386/tls.h b/linuxthreads/sysdeps/i386/tls.h index 456e8da675..2c5d3e0e8c 100644 --- a/linuxthreads/sysdeps/i386/tls.h +++ b/linuxthreads/sysdeps/i386/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. linuxthreads/i386 version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 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 @@ -184,7 +184,7 @@ TLS_DO_MODIFY_LDT_KERNEL_CHECK( \ #if defined NEED_DL_SYSINFO # define INIT_SYSINFO \ - head->sysinfo = GL(dl_sysinfo) + head->sysinfo = GLRO(dl_sysinfo) #else # define INIT_SYSINFO #endif diff --git a/linuxthreads/sysdeps/ia64/tls.h b/linuxthreads/sysdeps/ia64/tls.h index 49ca977c1c..1c2388c1ed 100644 --- a/linuxthreads/sysdeps/ia64/tls.h +++ b/linuxthreads/sysdeps/ia64/tls.h @@ -1,5 +1,5 @@ /* Definitions for thread-local data handling. linuxthreads/IA-64 version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 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 @@ -83,7 +83,7 @@ typedef struct #if defined NEED_DL_SYSINFO # define INIT_SYSINFO \ - (((tcbhead_t *)__thread_self)->private = GL(dl_sysinfo)) + (((tcbhead_t *)__thread_self)->private = GLRO(dl_sysinfo)) #else # define INIT_SYSINFO 0 #endif diff --git a/nptl/ChangeLog b/nptl/ChangeLog index 6d271a05b3..b5ee107e23 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,5 +1,8 @@ 2004-03-07 Ulrich Drepper <drepper@redhat.com> + * sysdeps/ia64/tls.h (INIT_SYSINFO): _dl_sysinfo is now in + _rtlf_global_ro. + * tst-once4.c: Remove unnecessary macro definition. * tst-mutex7.c (do_test): Limit thread stack size. diff --git a/nptl/sysdeps/ia64/tls.h b/nptl/sysdeps/ia64/tls.h index a37d6f4d32..4591a415c0 100644 --- a/nptl/sysdeps/ia64/tls.h +++ b/nptl/sysdeps/ia64/tls.h @@ -1,5 +1,5 @@ /* Definition for thread-local data handling. nptl/IA-64 version. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 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 @@ -104,7 +104,7 @@ register struct pthread *__thread_self __asm__("r13"); #define THREAD_SYSINFO(pd) (((tcbhead_t *) ((pd) + 1))->private) #if defined NEED_DL_SYSINFO -# define INIT_SYSINFO THREAD_SELF_SYSINFO = (void *) GL(dl_sysinfo) +# define INIT_SYSINFO THREAD_SELF_SYSINFO = (void *) GLRO(dl_sysinfo) #else # define INIT_SYSINFO NULL #endif diff --git a/sysdeps/unix/sysv/linux/ia64/dl-static.c b/sysdeps/unix/sysv/linux/ia64/dl-static.c index 691ba31582..4efc077032 100644 --- a/sysdeps/unix/sysv/linux/ia64/dl-static.c +++ b/sysdeps/unix/sysv/linux/ia64/dl-static.c @@ -55,8 +55,8 @@ _dl_static_init (struct link_map *map) __libc_lock_lock_recursive (_dl_static_lock); - loadbase = _dl_lookup_symbol ("_dl_var_init", map, &ref, - map->l_local_scope, 0, 1); + loadbase = _dl_lookup_symbol_x ("_dl_var_init", map, &ref, + map->l_local_scope, NULL, 0, 1, NULL); if (ref != NULL) { f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref); |