diff options
| author | Cary Coutant <ccoutant@google.com> | 2014-05-30 10:21:27 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2014-05-30 10:21:27 -0700 |
| commit | f6fb832249b8c64e9c35571fdabc323a62ad31fa (patch) | |
| tree | 61f5f5c2a29263e7d418ecc7991abbc4a983e473 /gold | |
| parent | 9ba6657a6b81a02dca9071ec14cbcef970f0ca07 (diff) | |
| download | fsf-binutils-gdb-f6fb832249b8c64e9c35571fdabc323a62ad31fa.zip fsf-binutils-gdb-f6fb832249b8c64e9c35571fdabc323a62ad31fa.tar.gz fsf-binutils-gdb-f6fb832249b8c64e9c35571fdabc323a62ad31fa.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".
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 6 | ||||
| -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, 9 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index a9dd87b..7b6fa81 100644 --- 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 0373464..379ac8a 100644 --- 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 11403ac..04a42e8 100644 --- 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 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 |