diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 1fde5ec463..92a8849cfe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-04-01 Ulrich Drepper <drepper@redhat.com> + + * sysdeps/unix/sysv/linux/init-first.c (init): Add code from + former init-first.h. Initialize __libc_multiple_libcs. + 2000-03-31 Ulrich Drepper <drepper@redhat.com> * iconv/skeleton.c: Define access macros with u suffix. Adjust diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index 94d2749be7..9f58d9cdbe 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -58,6 +58,12 @@ static void init (int argc, char **argv, char **envp) { extern void __getopt_clean_environment (char **); + /* The next variable is only here to work around a bug in gcc <= 2.7.2.2. + If the address would be taken inside the expression the optimizer + would try to be too smart and throws it away. Grrr. */ + int *dummy_addr = &_dl_starting_up; + + __libc_multiple_libcs = dummy_addr && !_dl_starting_up; /* Make sure we don't initialize twice. */ if (!__libc_multiple_libcs) |