diff options
| author | Roland McGrath <roland@gnu.org> | 2002-10-24 19:14:59 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2002-10-24 19:14:59 +0000 |
| commit | 5bbcba0db58cef39ec4b582cd665ccb019dc6763 (patch) | |
| tree | 5e18843757e510eddaef04aa3213bcb351681319 /sysdeps/unix/sysv/aix | |
| parent | 369b849f1a382df2c1ee5d3a997bf318950cf5ab (diff) | |
| download | glibc-5bbcba0db58cef39ec4b582cd665ccb019dc6763.tar.gz glibc-5bbcba0db58cef39ec4b582cd665ccb019dc6763.tar.xz glibc-5bbcba0db58cef39ec4b582cd665ccb019dc6763.zip | |
* elf/dl-misc.c: Include <sysdep.h>.
(_dl_debug_vdprintf): Only take dl_load_lock if not _dl_starting_up. * sysdeps/generic/ldsodefs.h (_dl_starting_up): Declare it here. * sysdeps/unix/sysv/linux/init-first.c: Not here. * sysdeps/powerpc/elf/libc-start.c: Or here. * sysdeps/unix/sysv/aix/libc-start.c: Or here. * sysdeps/unix/sysv/aix/start-libc.c: Or here. * sysdeps/unix/sysv/aix/init-first.c: Or here. * sysdeps/generic/libc-start.c: Or here. * sysdeps/unix/sysv/linux/init-first.c (init): Protect _dl_starting_up access with [! SHARED]. * sysdeps/unix/sysv/aix/init-first.c (init): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/aix')
| -rw-r--r-- | sysdeps/unix/sysv/aix/init-first.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/aix/libc-start.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/aix/start-libc.c | 2 |
3 files changed, 2 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/aix/init-first.c b/sysdeps/unix/sysv/aix/init-first.c index 4c6768b8ad..8272a62824 100644 --- a/sysdeps/unix/sysv/aix/init-first.c +++ b/sysdeps/unix/sysv/aix/init-first.c @@ -37,9 +37,6 @@ extern void __libc_init (int, char **, char **); /* The function is called from assembly stubs the compiler can't see. */ static void init (int, char **, char **) __attribute__ ((unused)); -extern int _dl_starting_up; -weak_extern (_dl_starting_up) - /* Set nonzero if we have to be prepared for more then one libc being used in the process. Safe assumption if initializer never runs. */ int __libc_multiple_libcs attribute_hidden = 1; @@ -60,10 +57,12 @@ init (int argc, char **argv, char **envp) If the address would be taken inside the expression the optimizer would try to be too smart and throws it away. Grrr. */ +#ifndef SHARED /* XXX disable dl for now int *dummy_addr = &_dl_starting_up; __libc_multiple_libcs = dummy_addr && !_dl_starting_up; */ +#endif /* Save the command-line arguments. */ __libc_argc = argc; diff --git a/sysdeps/unix/sysv/aix/libc-start.c b/sysdeps/unix/sysv/aix/libc-start.c index 757b34975c..813e28d09b 100644 --- a/sysdeps/unix/sysv/aix/libc-start.c +++ b/sysdeps/unix/sysv/aix/libc-start.c @@ -31,8 +31,6 @@ typedef unsigned char uchar; extern void __libc_init_first (int argc, char **argv, char **envp); /* XXX disable for now -extern int _dl_starting_up; -weak_extern (_dl_starting_up) extern int __libc_multiple_libcs; */ /* XXX normally defined in generic/dl-sydep.c, hack it into existance diff --git a/sysdeps/unix/sysv/aix/start-libc.c b/sysdeps/unix/sysv/aix/start-libc.c index 303caa7078..0cbe79d0b1 100644 --- a/sysdeps/unix/sysv/aix/start-libc.c +++ b/sysdeps/unix/sysv/aix/start-libc.c @@ -31,8 +31,6 @@ typedef unsigned char uchar; extern void __libc_init_first (int argc, char **argv, char **envp); /* XXX disable for now -extern int _dl_starting_up; -weak_extern (_dl_starting_up) extern int __libc_multiple_libcs; */ /* XXX normally defined in generic/dl-sydep.c, hack it into existance |