From 9fb11d4c6e3352db2ab019133d5de35da057d2f9 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 10 Apr 2008 05:02:48 +0000 Subject: [PATCH] * elf/Makefile (tests): Substitute tests-vis-yes here. (tests-vis-yes): Delete. (modules-name, modules-vis-yes): Similarly. --- ChangeLog | 6 ++++++ elf/Makefile | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 374553e..2dcde3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-22 Alan Modra + + * elf/Makefile (tests): Substitute tests-vis-yes here. + (tests-vis-yes): Delete. + (modules-name, modules-vis-yes): Similarly. + 2008-02-12 Pete Eberlein [BZ #4407] diff --git a/elf/Makefile b/elf/Makefile index 2dd2424..861485d 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 | \ -- 2.7.4