diff options
| author | Cary Coutant <ccoutant@google.com> | 2014-05-30 10:21:27 -0700 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2014-06-13 00:59:04 +0930 |
| commit | 0211120ecff9945c97c5e36a6e35ee423b987841 (patch) | |
| tree | 89c989828df42b293e4eb35f637b4ece27b940cd | |
| parent | a59a57ffe3e393726af851a0ae9654b2922f22ee (diff) | |
| download | gdb-0211120ecff9945c97c5e36a6e35ee423b987841.zip gdb-0211120ecff9945c97c5e36a6e35ee423b987841.tar.gz gdb-0211120ecff9945c97c5e36a6e35ee423b987841.tar.bz2 | |
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".
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.am | 2 | ||||
| -rw-r--r-- | gold/testsuite/Makefile.in | 2 | ||||
| -rwxr-xr-x | gold/testsuite/ehdr_start_test_4.sh | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index aa856fa..9bed0e7 100644 --- 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 c76c0e6..ea7fadc 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 73b84e3..dcdb26d 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 ad0a5a7..5e3d20f 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 |