From: Cary Coutant Date: Fri, 30 May 2014 17:21:27 +0000 (-0700) Subject: Fix testsuite to use newly-built linker for ehdr_start_test_4, and fix X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0211120ecff9945c97c5e36a6e35ee423b987841;p=thirdparty%2Fbinutils-gdb.git 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 aa856faac01..9bed0e7c4ac 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,6 +1,11 @@ 2014-06-12 Alan Modra Backport mainline patches + 2014-05-30 Cary Coutant + * 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 * 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 c76c0e6cb9e..ea7fadc782f 100644 --- 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 73b84e305fb..dcdb26d9bf7 100644 --- 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 ad0a5a7ef07..5e3d20fc66b 100755 --- 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