diff options
Diffstat (limited to 'libc/elf/Makefile')
| -rw-r--r-- | libc/elf/Makefile | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/libc/elf/Makefile b/libc/elf/Makefile index 774640f9a..16c752f26 100644 --- a/libc/elf/Makefile +++ b/libc/elf/Makefile @@ -160,7 +160,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 \ @@ -176,7 +176,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)) @@ -185,7 +184,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 \ @@ -221,7 +220,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. @@ -807,7 +805,7 @@ $(objpfx)tst-array5-static.out: $(objpfx)tst-array5-static cmp $@ tst-array5-static.exp > /dev/null ifeq (yesyes,$(have-fpie)$(build-shared)) -CFLAGS-tst-pie1.c += -fpie +CFLAGS-tst-pie1.c += $(pie-ccflag) $(objpfx)tst-pie1.out: $(objpfx)tst-pie1 $(cross-test-wrapper) \ @@ -849,10 +847,14 @@ $(objpfx)tst-dlmodcount: $(libdl) $(objpfx)tst-dlmodcount.out: $(test-modules) check-data := $(firstword $(wildcard \ - $(patsubst %,../scripts/data/localplt-%.data,\ - $(addsuffix -$(config-os),\ - $(config-machine) $(base-machine))\ - generic))) + $(foreach D,$(add-ons) scripts,\ + $(patsubst %,$(..)$D/data/localplt-%.data,\ + $(abi-name) \ + $(addsuffix -$(config-os),\ + $(config-machine) \ + $(base-machine)) \ + generic)))) + tests: $(objpfx)check-localplt.out ifeq ($(have-thread-library),yes) @@ -861,9 +863,11 @@ 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 \ + $(common-objpfx)resolv/libresolv.so \ + $(common-objpfx)crypt/libcrypt.so \ $(check-data) $(dir $<)$(notdir $<) $(filter-out $< $(check-data),$^) | \ LC_ALL=C sort | \ |