Fix elf/tst-ldconfig-X for cross testing.

elf/Makefile passes arguments to tst-ldconfig-X.sh that are different
from what it expects, so resulting in the test failing in cross
testing.  This patch corrects the arguments passed (the script itself
has correct logic for cross testing, it's just the Makefile that's
wrong).

Tested for powerpc (cross testing) and for x86_64 (native testing).

	* elf/Makefile ($(objpfx)tst-ldconfig-X.out): Correct arguments
	passed to tst-ldconfig-X.sh.

diff --git a/ChangeLog b/ChangeLog
index 2de8cd9607951bf4dfe054adcc90fd96852b3908..8af3a199519fa2af26bdb48d639a12edc5dfa331 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-01-03  Joseph Myers  <joseph@codesourcery.com>
+
+       * elf/Makefile ($(objpfx)tst-ldconfig-X.out): Correct arguments
+       passed to tst-ldconfig-X.sh.
+
 2017-01-03  Martin Galvan  <martingalvan@sourceware.org>
 
        * nptl/nptl-printers.py: Fix tabs/spaces mismatches.

diff --git a/elf/Makefile b/elf/Makefile
index 0b9088470149ff62ae2e3f4b199b3942302c828c..c7a29693bd457706808788e0506ad21aad69e4bb 100644 (file)
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1355,7 +1355,8 @@ $(objpfx)tst-prelink-cmp.out: tst-prelink.exp \
        $(evaluate-test)
 
 $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig
-       $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \
+       $(SHELL) $< '$(common-objpfx)' '$(test-wrapper-env)' \
+                '$(run-program-env)' > $@; \
        $(evaluate-test)
 
 $(objpfx)tst-dlsym-error: $(libdl)