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 /elf/Makefile | |
| 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 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/elf/Makefile b/elf/Makefile index c43eb02f5b..a563f0190f 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -88,7 +88,9 @@ distribute := rtld-Rules \ unload4mod1.c unload4mod2.c unload4mod3.c unload4mod4.c \ unload6mod1.c unload6mod2.c unload6mod3.c tst-auditmod1.c \ order2mod1.c order2mod2.c order2mod3.c order2mod4.c \ - tst-stackguard1.c tst-stackguard1-static.c + tst-stackguard1.c tst-stackguard1-static.c \ + tst-array5.c tst-array5-static.c tst-array5dep.c \ + tst-array5.exp CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables @@ -138,7 +140,7 @@ endif tests = tst-tls1 tst-tls2 tst-tls9 ifeq (yes,$(have-initfini-array)) -tests += tst-array1 tst-array2 tst-array3 tst-array4 +tests += tst-array1 tst-array2 tst-array3 tst-array4 tst-array5 endif ifeq (yes,$(build-static)) tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static @@ -148,7 +150,7 @@ tst-tls9-static-ENV = \ LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn endif ifeq (yes,$(have-initfini-array)) -tests-static += tst-array1-static +tests-static += tst-array1-static tst-array5-static endif tests += $(tests-static) endif @@ -206,7 +208,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ unload6mod1 unload6mod2 unload6mod3 \ order2mod1 order2mod2 order2mod3 order2mod4 ifeq (yes,$(have-initfini-array)) -modules-names += tst-array2dep +modules-names += tst-array2dep tst-array5dep endif ifeq (yesyes,$(have-fpie)$(build-shared)) modules-names += tst-piemod1 @@ -767,6 +769,17 @@ $(objpfx)tst-array4.out: $(objpfx)tst-array4 $(objpfx)tst-array2dep.so $< > $@ cmp $@ tst-array4.exp > /dev/null +$(objpfx)tst-array5: $(objpfx)tst-array5dep.so +$(objpfx)tst-array5.out: $(objpfx)tst-array5 + $(elf-objpfx)$(rtld-installed-name) \ + --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(objpfx)tst-array5 > $@ + cmp $@ tst-array5.exp > /dev/null + +$(objpfx)tst-array5-static.out: $(objpfx)tst-array5-static + $(objpfx)tst-array5-static > $@ + cmp $@ tst-array5-static.exp > /dev/null + ifeq (yesyes,$(have-fpie)$(build-shared)) CFLAGS-tst-pie1.c += -fpie |