diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/arm/init-first.c | 6 | ||||
| -rw-r--r-- | sysdeps/generic/init-first.c | 6 | ||||
| -rw-r--r-- | sysdeps/i386/init-first.c | 6 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/i386/init-first.c | 4 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/mips/init-first.c | 6 | ||||
| -rw-r--r-- | sysdeps/sh/init-first.c | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 4 |
8 files changed, 37 insertions, 5 deletions
@@ -9,6 +9,10 @@ only if USE_NONOPTION_FLAGS is defined. * sysdeps/mach/hurd/mips/init-first.c: Likewise. * sysdeps/unix/sysv/linux/init-first.c: Likewise. + * sysdeps/arm/init-first.c: Likewise. + * sysdeps/generic/init-first.c: Likewise. + * sysdeps/i386/init-first.c: Likewise. + * sysdeps/sh/init-first.c: Likewise. 2001-08-11 Andreas Jaeger <aj@suse.de> diff --git a/sysdeps/arm/init-first.c b/sysdeps/arm/init-first.c index cc8da31..6856314 100644 --- a/sysdeps/arm/init-first.c +++ b/sysdeps/arm/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For ARM. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 2001 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 @@ -20,7 +20,9 @@ #include <unistd.h> extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif extern void __libc_global_ctors (void); int __libc_multiple_libcs = 1; @@ -35,8 +37,10 @@ init (int *data) __environ = envp; __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif } #ifdef SHARED diff --git a/sysdeps/generic/init-first.c b/sysdeps/generic/init-first.c index e633ccd..5ae1e15 100644 --- a/sysdeps/generic/init-first.c +++ b/sysdeps/generic/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. Stub version. - Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 1998, 2001 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 @@ -23,7 +23,9 @@ int __libc_multiple_libcs = 1; extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif #ifdef SHARED void @@ -48,6 +50,8 @@ void __libc_init_first __environ = envp; __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif } diff --git a/sysdeps/i386/init-first.c b/sysdeps/i386/init-first.c index 3c82fff..16f5a7c 100644 --- a/sysdeps/i386/init-first.c +++ b/sysdeps/i386/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For i386/Unix. - Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 2000, 2001 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 @@ -20,7 +20,9 @@ #include <unistd.h> extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif extern void __libc_global_ctors (void); int __libc_multiple_libcs = 1; @@ -35,8 +37,10 @@ init (int *data) __environ = envp; __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif } #ifdef SHARED diff --git a/sysdeps/mach/hurd/i386/init-first.c b/sysdeps/mach/hurd/i386/init-first.c index d69a2ce..15c9dea 100644 --- a/sysdeps/mach/hurd/i386/init-first.c +++ b/sysdeps/mach/hurd/i386/init-first.c @@ -29,7 +29,9 @@ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif extern void __libc_global_ctors (void); unsigned int __hurd_threadvar_max; @@ -64,8 +66,10 @@ posixland_init (int argc, char **argv, char **envp) __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif #ifdef SHARED __libc_global_ctors (); diff --git a/sysdeps/mach/hurd/mips/init-first.c b/sysdeps/mach/hurd/mips/init-first.c index b81fe3c..d0ab593 100644 --- a/sysdeps/mach/hurd/mips/init-first.c +++ b/sysdeps/mach/hurd/mips/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For Mips/Hurd. - Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 2000, 2001 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 @@ -27,7 +27,9 @@ extern void __mach_init (void); extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif extern void __libc_global_ctors (void); unsigned int __hurd_threadvar_max; @@ -106,8 +108,10 @@ init1 (int argc, char *arg0, ...) __libc_init (argc, argv, __environ); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif #ifdef SHARED __libc_global_ctors (); diff --git a/sysdeps/sh/init-first.c b/sysdeps/sh/init-first.c index de5adeb..97f7352 100644 --- a/sysdeps/sh/init-first.c +++ b/sysdeps/sh/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. For SH. - Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc. + Copyright (C) 1995,1996,1997,1998,2000,2001 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 @@ -20,7 +20,9 @@ #include <unistd.h> extern void __libc_init (int, char **, char **); +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif extern void __libc_global_ctors (void); int __libc_multiple_libcs = 1; @@ -35,8 +37,10 @@ init (int *data) __environ = envp; __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif } #ifdef SHARED diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index c80941c..3cfb08d 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -57,7 +57,9 @@ char **__libc_argv; static void init (int argc, char **argv, char **envp) { +#ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); +#endif /* 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. */ @@ -92,8 +94,10 @@ init (int argc, char **argv, char **envp) __libc_init (argc, argv, envp); +#ifdef USE_NONOPTION_FLAGS /* This is a hack to make the special getopt in GNU libc working. */ __getopt_clean_environment (envp); +#endif #ifdef SHARED __libc_global_ctors (); |