summary refs log tree commit diff
path: root/elf/Makefile
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2003-09-24 01:56:08 +0000
committerRoland McGrath <roland@gnu.org>2003-09-24 01:56:08 +0000
commitc70ba48888000f00556aa91348c9c5a33a508b49 (patch)
treeeb0d2bf8d0d96ff29d929d6ba2efe397262c8109 /elf/Makefile
parent217ed70e1381922db0d0d7fa41e4938114848251 (diff)
downloadglibc-c70ba48888000f00556aa91348c9c5a33a508b49.tar.gz
glibc-c70ba48888000f00556aa91348c9c5a33a508b49.tar.xz
glibc-c70ba48888000f00556aa91348c9c5a33a508b49.zip
* elf/rtld.c (dl_main): In rtld_is_main case, reinitialize
	GL(dl_stack_flags) according to rtld's own PT_GNU_STACK.
	Move GL(dl_make_stack_executable_hook) initialization up.
	* elf/tst-execstack-prog.c: New file.
	* elf/Makefile (tests-execstack-yes): Add it.
	(LDFLAGS-tst-execstack-prog): New variable.
Diffstat (limited to 'elf/Makefile')
-rw-r--r--elf/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 36f205abb2..2e6b6cb2b2 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -159,7 +159,7 @@ test-srcs = tst-pathopt
 tests-vis-yes = vismain
 tests-nodelete-yes = nodelete nodelete2
 tests-nodlopen-yes = nodlopen nodlopen2
-tests-execstack-yes = tst-execstack tst-execstack-needed
+tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
 endif
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \
@@ -673,6 +673,8 @@ LDFLAGS-tst-execstack-mod = -Wl,-z,execstack
 
 $(objpfx)tst-execstack-needed: $(objpfx)tst-execstack-mod.so
 LDFLAGS-tst-execstack-needed = -Wl,-z,noexecstack
+
+LDFLAGS-tst-execstack-prog = -Wl,-z,execstack
 endif
 
 $(objpfx)tst-array1.out: $(objpfx)tst-array1