about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-04-10 05:02:48 +0000
committerUlrich Drepper <drepper@redhat.com>2008-04-10 05:02:48 +0000
commit9fb11d4c6e3352db2ab019133d5de35da057d2f9 (patch)
treed324bc4c3dba57729e59dc198efacd562ca56548
parentfacd1d8ef35edb863523a7165a64d55196cc2d36 (diff)
downloadglibc-9fb11d4c6e3352db2ab019133d5de35da057d2f9.tar.gz
glibc-9fb11d4c6e3352db2ab019133d5de35da057d2f9.tar.xz
glibc-9fb11d4c6e3352db2ab019133d5de35da057d2f9.zip
* elf/Makefile (tests): Substitute tests-vis-yes here.
	(tests-vis-yes): Delete.
	(modules-name, modules-vis-yes): Similarly.
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile12
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 374553e507..2dcde3e2a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Alan Modra  <amodra@bigpond.net.au>
+
+	* elf/Makefile (tests): Substitute tests-vis-yes here.
+	(tests-vis-yes): Delete.
+	(modules-name, modules-vis-yes): Similarly.
+
 2008-02-12  Pete Eberlein  <eberlein@us.ibm.com>
 
 	[BZ #4407]
diff --git a/elf/Makefile b/elf/Makefile
index 2dd2424b28..861485dcd1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -159,7 +159,7 @@ tests += $(tests-static)
 endif
 ifeq (yes,$(build-shared))
 tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
-	 constload1 order $(tests-vis-$(have-protected)) noload filter unload \
+	 constload1 order vismain noload filter unload \
 	 reldep reldep2 reldep3 reldep4 nodelete nodelete2 \
 	 nodlopen nodlopen2 neededtest neededtest2 \
 	 neededtest3 neededtest4 unload2 lateglobal initfirst global \
@@ -175,7 +175,6 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
 	 tst-stackguard1 tst-addr1 tst-thrlock
 #	 reldep9
 test-srcs = tst-pathopt
-tests-vis-yes = vismain
 tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog
 endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
@@ -184,7 +183,7 @@ endif
 tests: $(objpfx)tst-leaks1-mem
 modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		testobj1_1 failobj constload2 constload3 unloadmod \
-		dep1 dep2 dep3 dep4 $(modules-vis-$(have-protected)) \
+		dep1 dep2 dep3 dep4 vismod1 vismod2 vismod3 \
 		nodelmod1 nodelmod2 nodelmod3 nodelmod4 \
 		nodel2mod1 nodel2mod2 nodel2mod3 \
 		nodlopenmod nodlopenmod2 filtmod1 filtmod2 \
@@ -220,7 +219,6 @@ endif
 ifeq (yesyes,$(have-fpie)$(build-shared))
 modules-names += tst-piemod1
 endif
-modules-vis-yes = vismod1 vismod2 vismod3
 modules-execstack-yes = tst-execstack-mod
 extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
 # We need this variable to be sure the test modules get the right CPPFLAGS.
@@ -855,9 +853,9 @@ endif
 
 $(objpfx)check-localplt.out: $(objpfx)check-localplt \
 			     $(common-objpfx)libc.so \
- 		    	     $(common-objpfx)math/libm.so $(thread-dso) \
- 		    	     $(common-objpfx)rt/librt.so \
- 		    	     $(common-objpfx)dlfcn/libdl.so \
+		    	     $(common-objpfx)math/libm.so $(thread-dso) \
+		    	     $(common-objpfx)rt/librt.so \
+		    	     $(common-objpfx)dlfcn/libdl.so \
 			     $(check-data)
 	$(dir $<)$(notdir $<) $(filter-out $< $(check-data),$^) | \
 	  LC_ALL=C sort | \