diff options
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/elf/Makefile b/elf/Makefile index 0d52318c22..84f83974b4 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -642,9 +642,7 @@ $(objpfx)circlemod2a.so: $(objpfx)circlemod3a.so $(objpfx)order: $(addprefix $(objpfx),dep4.so dep3.so dep2.so dep1.so) $(objpfx)order.out: $(objpfx)order - $(test-wrapper) \ - $(elf-objpfx)$(rtld-installed-name) \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(test-program-prefix) \ $(objpfx)order > $@ (echo "0123456789" | cmp $@ -) > /dev/null @@ -852,36 +850,36 @@ LDFLAGS-tst-execstack-prog = -Wl,-z,execstack endif $(objpfx)tst-array1.out: tst-array1.exp $(objpfx)tst-array1 - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array1.exp > /dev/null $(objpfx)tst-array1-static.out: tst-array1.exp $(objpfx)tst-array1-static - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array1.exp > /dev/null $(objpfx)tst-array2: $(objpfx)tst-array2dep.so $(objpfx)tst-array2.out: tst-array2.exp $(objpfx)tst-array2 - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array2.exp > /dev/null $(objpfx)tst-array3.out: tst-array1.exp $(objpfx)tst-array3 - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array1.exp > /dev/null $(objpfx)tst-array4: $(libdl) $(objpfx)tst-array4.out: tst-array4.exp $(objpfx)tst-array4 \ $(objpfx)tst-array2dep.so - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array4.exp > /dev/null $(objpfx)tst-array5: $(objpfx)tst-array5dep.so $(objpfx)tst-array5.out: tst-array5.exp $(objpfx)tst-array5 - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array5.exp > /dev/null $(objpfx)tst-array5-static.out: tst-array5-static.exp \ $(objpfx)tst-array5-static - $(built-program-cmd) > $@ + $(test-program-cmd) > $@ cmp $@ tst-array5-static.exp > /dev/null CFLAGS-tst-pie1.c += $(pie-ccflag) @@ -1030,9 +1028,7 @@ $(objpfx)tst-global1.out: $(objpfx)testobj6.so $(objpfx)testobj2.so $(objpfx)order2: $(libdl) $(objpfx)order2.out: $(objpfx)order2 $(objpfx)order2mod1.so \ $(objpfx)order2mod2.so - $(test-wrapper) \ - $(elf-objpfx)$(rtld-installed-name) \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(test-program-prefix) \ $(objpfx)order2 > $@ (echo "12345" | cmp $@ -) > /dev/null $(objpfx)order2mod1.so: $(objpfx)order2mod4.so @@ -1042,7 +1038,7 @@ order2mod2.so-no-z-defs = yes LDFLAGS-order2mod1.so = $(no-as-needed) LDFLAGS-order2mod2.so = $(no-as-needed) -tst-stackguard1-ARGS = --command "$(host-built-program-cmd) --child" +tst-stackguard1-ARGS = --command "$(host-test-program-cmd) --child" tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child" $(objpfx)tst-leaks1: $(libdl) @@ -1125,9 +1121,7 @@ $(objpfx)tst-unique3.out: $(objpfx)tst-unique3lib2.so $(objpfx)tst-unique4: $(objpfx)tst-unique4lib.so $(objpfx)tst-initorder.out: $(objpfx)tst-initorder - $(test-wrapper) \ - $(elf-objpfx)${rtld-installed-name} \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(test-program-prefix) \ $< > $@ cmp $@ tst-initorder.exp > /dev/null @@ -1147,9 +1141,7 @@ object-suffixes-left := a b c d include $(o-iterator) $(objpfx)tst-initorder2.out: $(objpfx)tst-initorder2 - $(test-wrapper) \ - $(elf-objpfx)${rtld-installed-name} \ - --library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \ + $(test-program-prefix) \ $< > $@ cmp $@ tst-initorder2.exp > /dev/null |