diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-07-07 23:00:02 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-07-07 23:00:02 +0000 |
| commit | 04395c90fce0f209fd71e19898e64c6614c908a1 (patch) | |
| tree | 9fdfa5ce11644f91a639d19a802fec0f2dc742ba /sysdeps | |
| parent | 6f8116b3ab733b05fe07d0f930a9e28e594dbaf8 (diff) | |
| download | glibc-04395c90fce0f209fd71e19898e64c6614c908a1.tar glibc-04395c90fce0f209fd71e19898e64c6614c908a1.tar.gz glibc-04395c90fce0f209fd71e19898e64c6614c908a1.tar.bz2 glibc-04395c90fce0f209fd71e19898e64c6614c908a1.zip | |
[BZ #974]
2005-04-13 H.J. Lu <hongjiu.lu@intel.com>
[BZ #974]
* csu/elf-init.c (__preinit_array_start): Take int, char **, char **.
(__preinit_array_end): Likewise.
(__init_array_start): Likewise.
(__init_array_end): Likewise.
(__libc_csu_init): Take int argc, char **argv, char **envp.
Call preinit_array and init_array with argc, argv, envp.
* sysdeps/generic/libc-start.c (LIBC_START_MAIN): Remove
INIT_MAIN_ARGS.
* sysdeps/powerpc/elf/libc-start.c (INIT_MAIN_ARGS): Removed.
* elf/Makefile (distribute): Add tst-array5.c, tst-array5-static.c,
tst-array5dep.c, and tst-array5.exp.
(tests): Add tst-array5.
(tests-static): Add tst-array5-static.
($(objpfx)tst-array5): New target.
($(objpfx)tst-array5.out): Likewise.
($(objpfx)tst-array5-static.out): Likewise.
* elf/tst-array5-static.c: New file.
* elf/tst-array5-static.exp: Likewise.
* elf/tst-array5.c: Likewise.
* elf/tst-array5.exp: Likewise.
* elf/tst-array5dep.c: Likewise.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/libc-start.c | 14 | ||||
| -rw-r--r-- | sysdeps/powerpc/elf/libc-start.c | 1 |
2 files changed, 1 insertions, 14 deletions
diff --git a/sysdeps/generic/libc-start.c b/sysdeps/generic/libc-start.c index 3fcadcf19f..194db6b1ec 100644 --- a/sysdeps/generic/libc-start.c +++ b/sysdeps/generic/libc-start.c @@ -75,11 +75,7 @@ STATIC int LIBC_START_MAIN (int (*main) (int, char **, char ** #ifdef LIBC_START_MAIN_AUXVEC_ARG ElfW(auxv_t) *__unbounded auxvec, #endif -#ifdef INIT_MAIN_ARGS __typeof (main) init, -#else - void (*init) (void), -#endif void (*fini) (void), void (*rtld_fini) (void), void *__unbounded stack_end) @@ -95,11 +91,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), #ifdef LIBC_START_MAIN_AUXVEC_ARG ElfW(auxv_t) *__unbounded auxvec, #endif -#ifdef INIT_MAIN_ARGS __typeof (main) init, -#else - void (*init) (void), -#endif void (*fini) (void), void (*rtld_fini) (void), void *__unbounded stack_end) { @@ -195,11 +187,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), GLRO(dl_debug_printf) ("\ninitialize program: %s\n\n", argv[0]); #endif if (init) - (*init) ( -#ifdef INIT_MAIN_ARGS - argc, argv, __environ MAIN_AUXVEC_PARAM -#endif - ); + (*init) (argc, argv, __environ MAIN_AUXVEC_PARAM); #ifdef SHARED /* Auditing checkpoint: we have a new object. */ diff --git a/sysdeps/powerpc/elf/libc-start.c b/sysdeps/powerpc/elf/libc-start.c index eed3e06c8a..af67a39a29 100644 --- a/sysdeps/powerpc/elf/libc-start.c +++ b/sysdeps/powerpc/elf/libc-start.c @@ -30,7 +30,6 @@ weak_extern (__cache_line_size) #define LIBC_START_DISABLE_INLINE #define LIBC_START_MAIN_AUXVEC_ARG #define MAIN_AUXVEC_ARG -#define INIT_MAIN_ARGS #include <sysdeps/generic/libc-start.c> |