Fix testsuite to use newly-built linker for ehdr_start_test_4, and fix

check script to look for the right binding.

gold/
	* testsuite/Makefile.am (ehdr_start_test_4): Fix typo in -B option.
	* testsuite/Makefile.in: Regenerate.
	* testsuite/ehdr_start_test_4.sh: Look for "U" instead of "w".

diff --git a/gold/ChangeLog b/gold/ChangeLog
index a9dd87b2c40168927ab3552663158dacd1649496..7b6fa81598e4b92cfa6a3eef30215a706b9e3cfd 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-30  Cary Coutant  <ccoutant@google.com>
+
+       * testsuite/Makefile.am (ehdr_start_test_4): Fix typo in -B option.
+       * testsuite/Makefile.in: Regenerate.
+       * testsuite/ehdr_start_test_4.sh: Look for "U" instead of "w".
+
 2014-05-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR gold/16945

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index 0373464ffbaf1877fa7f9b8b8700af697d1e1fb4..379ac8a8f3b405e44c927cfa55010d3d6bc80d2d 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -2241,7 +2241,7 @@ MOSTLYCLEANFILES += ehdr_start_test_4
 ehdr_start_test_4.syms: ehdr_start_test_4
        $(TEST_NM) ehdr_start_test_4 > $@
 ehdr_start_test_4: ehdr_start_test_4.o gcctestdir/ld
-       $(CXXLINK) -Bgcctestdir/ld/ -Wl,-Ttext=0x100100 $<
+       $(CXXLINK) -Bgcctestdir/ -Wl,-Ttext=0x100100 $<
 ehdr_start_test_4.o: ehdr_start_test.cc
        $(CXXCOMPILE) -c -DEHDR_START_WEAK -o $@ $<
 

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index 11403ac885ec6fcbf336f13c465127103ac7e86b..04a42e8dbbb3a42cbf6feb8192d2d0701a46048e 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -5597,7 +5597,7 @@ uninstall-am:
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ehdr_start_test_4.syms: ehdr_start_test_4
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_NM) ehdr_start_test_4 > $@
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ehdr_start_test_4: ehdr_start_test_4.o gcctestdir/ld
-@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ld/ -Wl,-Ttext=0x100100 $<
+@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXLINK) -Bgcctestdir/ -Wl,-Ttext=0x100100 $<
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ehdr_start_test_4.o: ehdr_start_test.cc
 @GCC_TRUE@@NATIVE_LINKER_TRUE@ $(CXXCOMPILE) -c -DEHDR_START_WEAK -o $@ $<
 

diff --git a/gold/testsuite/ehdr_start_test_4.sh b/gold/testsuite/ehdr_start_test_4.sh
index ad0a5a7ef071b2ab0307af9543b3a0bf0db443a3..5e3d20fc66b561a1879e582fa7f9571f25782ea0 100755 (executable)
--- a/gold/testsuite/ehdr_start_test_4.sh
+++ b/gold/testsuite/ehdr_start_test_4.sh
@@ -35,6 +35,6 @@ check()
     fi
 }
 
-check ehdr_start_test_4.syms "w __ehdr_start"
+check ehdr_start_test_4.syms "U __ehdr_start"
 
 exit 0