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 aa856faac01d79abe523226d6bda77b01c62bd36..9bed0e7c4aca5819aa9f6134beeb88d1f8fd58ea 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,6 +1,11 @@
 2014-06-12  Alan Modra  <amodra@gmail.com>
 
        Backport mainline patches
+       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-15  Alan Modra  <amodra@gmail.com>
        * powerpc.cc (do_plt_fde_location): Handle zero length .glink.
        Compare FDE contents with DW_CFA_nop rather than 0.

diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am
index c76c0e6cb9ec21f0075a722b272e4767e5ee947b..ea7fadc782fbb7f2ce53ca113e512fe10e6ede50 100644 (file)
--- a/gold/testsuite/Makefile.am
+++ b/gold/testsuite/Makefile.am
@@ -2179,7 +2179,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 73b84e305fb09b3267668375a4e46f3452c7ab1e..dcdb26d9bf70b481492ef17777cbb1b56200321f 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -5506,7 +5506,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