* elf/Makefile: Revert accidental changes in last commit.

diff --git a/ChangeLog b/ChangeLog
index a99e6913b751d60ea6fa3745f2dca99b94d850d6..038186f86d0234ce2f22ddd58127231d364aeb3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-07-29  Roland McGrath  <roland@redhat.com>
 
+       * elf/Makefile: Revert accidental changes in last commit.
+
        * rt/tst-timer2.c: New file.
        * rt/Makefile (tests): Add it.
 

diff --git a/elf/Makefile b/elf/Makefile
index 63384f423a9534a533447d619697f65c74cc955d..66419becb83a6b39d4e9ebe76d05c12c76c2e534 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -29,8 +29,7 @@ routines      = $(dl-routines) dl-open dl-close dl-support dl-iteratephdr \
 # profiled libraries.
 dl-routines    = $(addprefix dl-,load cache lookup object reloc deps \
                                  runtime error init fini debug misc \
-                                 version profile conflict tls origin \
-                                 execstack)
+                                 version profile conflict tls origin)
 all-dl-routines = $(dl-routines) $(sysdep-dl-routines)
 # But they are absent from the shared libc, because that code is in ld.so.
 elide-routines.os = $(all-dl-routines) dl-support enbl-secure \
@@ -81,7 +80,6 @@ distribute    := rtld-Rules \
                   reldep9.c reldep9mod1.c reldep9mod2.c reldep9mod3.c \
                   tst-array1.exp tst-array2.exp tst-array4.exp \
                   tst-array2dep.c \
-                  tst-execstack-mod.c \
                   check-textrel.c dl-sysdep.h
 
 CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables
@@ -150,8 +148,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
         neededtest3 neededtest4 unload2 lateglobal initfirst global \
         restest2 next dblload dblunload reldep5 reldep6 reldep7 reldep8 \
         circleload1 tst-tls3 tst-tls4 tst-tls5 tst-tls6 tst-tls7 tst-tls8 \
-        tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 \
-        tst-execstack
+        tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14
 #       reldep9
 test-srcs = tst-pathopt
 tests-vis-yes = vismain
@@ -178,8 +175,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
                circlemod1 circlemod1a circlemod2 circlemod2a \
                circlemod3 circlemod3a \
                reldep8mod1 reldep8mod2 reldep8mod3 \
-               reldep9mod1 reldep9mod2 reldep9mod3 \
-               tst-execstack-mod
+               reldep9mod1 reldep9mod2 reldep9mod3
 ifeq (yes,$(have-initfini-array))
 modules-names += tst-array2dep
 endif
@@ -652,11 +648,6 @@ $(objpfx)tst-tls9-static: $(common-objpfx)dlfcn/libdl.a
 $(objpfx)tst-tls9-static.out: $(objpfx)tst-tlsmod5.so $(objpfx)tst-tlsmod6.so
 endif
 
-$(objpfx)tst-execstack: $(libdl)
-$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
-LDFLAGS-tst-execstack = -Wl,-z,noexecstack
-LDFLAGS-tst-execstack-mod = -Wl,-z,execstack
-
 $(objpfx)tst-array1.out: $(objpfx)tst-array1
        $(elf-objpfx)$(rtld-installed-name) \
          --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \