diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/Makefile | 21 | ||||
| -rw-r--r-- | elf/tst-array5-static.c | 1 | ||||
| -rw-r--r-- | elf/tst-array5-static.exp | 2 | ||||
| -rw-r--r-- | elf/tst-array5.c | 50 | ||||
| -rw-r--r-- | elf/tst-array5.exp | 3 | ||||
| -rw-r--r-- | elf/tst-array5dep.c | 23 |
6 files changed, 96 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 diff --git a/elf/tst-array5-static.c b/elf/tst-array5-static.c new file mode 100644 index 0000000000..4ef2aba3f3 --- /dev/null +++ b/elf/tst-array5-static.c @@ -0,0 +1 @@ +#include "tst-array5.c" diff --git a/elf/tst-array5-static.exp b/elf/tst-array5-static.exp new file mode 100644 index 0000000000..b1dc9e467b --- /dev/null +++ b/elf/tst-array5-static.exp @@ -0,0 +1,2 @@ +preinit array in executable: tst-array5-static +init array in executable: tst-array5-static diff --git a/elf/tst-array5.c b/elf/tst-array5.c new file mode 100644 index 0000000000..03a5668326 --- /dev/null +++ b/elf/tst-array5.c @@ -0,0 +1,50 @@ +#include <string.h> +#include <unistd.h> + +static void +preinit_0 (int argc __attribute__ ((unused)), char **argv) +{ + char *p = strrchr (argv [0], '/'); + + if (p == NULL) + return; + + p++; + size_t len = strlen (p); + write (STDOUT_FILENO, "preinit array in executable: ", 29); + write (STDOUT_FILENO, p, len); + write (STDOUT_FILENO, "\n", 1); +} + +void (*const preinit_array []) (int, char **) + __attribute__ ((section (".preinit_array"), aligned (sizeof (void *)))) = +{ + &preinit_0, +}; + +static void +init_0 (int argc __attribute__ ((unused)), char **argv) +{ + char *p = strrchr (argv [0], '/'); + + if (p == NULL) + return; + + p++; + size_t len = strlen (p); + write (STDOUT_FILENO, "init array in executable: ", 26); + write (STDOUT_FILENO, p, len); + write (STDOUT_FILENO, "\n", 1); +} + +void (*const init_array []) (int, char **) + __attribute__ ((section (".init_array"), aligned (sizeof (void *)))) = +{ + &init_0, +}; + +int +main (void) +{ + return 0; +} diff --git a/elf/tst-array5.exp b/elf/tst-array5.exp new file mode 100644 index 0000000000..28b4909833 --- /dev/null +++ b/elf/tst-array5.exp @@ -0,0 +1,3 @@ +preinit array in executable: tst-array5 +init array in DSO: tst-array5 +init array in executable: tst-array5 diff --git a/elf/tst-array5dep.c b/elf/tst-array5dep.c new file mode 100644 index 0000000000..570d282af4 --- /dev/null +++ b/elf/tst-array5dep.c @@ -0,0 +1,23 @@ +#include <string.h> +#include <unistd.h> + +static void +init_0 (int argc __attribute__ ((unused)), char **argv) +{ + char *p = strrchr (argv [0], '/'); + + if (p == NULL) + return; + + p++; + size_t len = strlen (p); + write (STDOUT_FILENO, "init array in DSO: ", 19); + write (STDOUT_FILENO, p, len); + write (STDOUT_FILENO, "\n", 1); +} + +void (*const init_array []) (int, char **) + __attribute__ ((section (".init_array"), aligned (sizeof (void *)))) = +{ + &init_0, +}; |