From 1cd17042aad6b0c2e10537bb400a496958178029 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 16 Feb 2016 05:55:11 -0800 Subject: [PATCH] Pass -mrelax-relocations=yes to $(TEST_AS) x86_64_mov_to_lea5.o and x86_64_mov_to_lea6.o must be assembled with -mrelax-relocations=yes since when assembler is configured with --disable-x86-relax-relocations, R_X86_64_GOTPCRELX relocation won't be generated. This linker optimization requires R_X86_64_GOTPCRELX relocation. This patch also removed the duplicated x86_64_overflow_pc32.o target. * testsuite/Makefile.am (x86_64_mov_to_lea5.o): Pass -mrelax-relocations=yes to $(TEST_AS). (x86_64_mov_to_lea6.o): Likewise. (x86_64_overflow_pc32.o): Remove duplicated target. * testsuite/Makefile.in: Regenerated. --- gold/ChangeLog | 8 ++++++++ gold/testsuite/Makefile.am | 6 ++---- gold/testsuite/Makefile.in | 6 ++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 1e261e2aac..45d02bf064 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2016-02-15 H.J. Lu + + * testsuite/Makefile.am (x86_64_mov_to_lea5.o): Pass + -mrelax-relocations=yes to $(TEST_AS). + (x86_64_mov_to_lea6.o): Likewise. + (x86_64_overflow_pc32.o): Remove duplicated target. + * testsuite/Makefile.in: Regenerated. + 2016-02-15 Marcin Kościelnicki * s390.cc (Target_s390::match_view_u): New helper method. diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 7240f98fed..32906db719 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -1010,9 +1010,9 @@ x86_64_mov_to_lea3.o: x86_64_mov_to_lea2.s x86_64_mov_to_lea4.o: x86_64_mov_to_lea2.s $(TEST_AS) --64 -o $@ $< x86_64_mov_to_lea5.o: x86_64_mov_to_lea3.s - $(TEST_AS) --x32 -o $@ $< + $(TEST_AS) --x32 -mrelax-relocations=yes -o $@ $< x86_64_mov_to_lea6.o: x86_64_mov_to_lea3.s - $(TEST_AS) --64 -o $@ $< + $(TEST_AS) --64 -mrelax-relocations=yes -o $@ $< x86_64_mov_to_lea7.o: x86_64_mov_to_lea4.s $(TEST_AS) --x32 -o $@ $< x86_64_mov_to_lea8.o: x86_64_mov_to_lea4.s @@ -1091,8 +1091,6 @@ x86_64_overflow_pc32.err: x86_64_overflow_pc32.o gcctestdir/ld check_SCRIPTS += x32_overflow_pc32.sh check_DATA += x32_overflow_pc32.err MOSTLYCLEANFILES += x32_overflow_pc32.err -x86_64_overflow_pc32.o: x86_64_overflow_pc32.s - $(TEST_AS) -o $@ $< x32_overflow_pc32.o: x86_64_overflow_pc32.s $(TEST_AS) --x32 -o $@ $< x32_overflow_pc32.err: x32_overflow_pc32.o gcctestdir/ld diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index 3cdf1a410a..fffd4cad49 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -5455,9 +5455,9 @@ uninstall-am: @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea4.o: x86_64_mov_to_lea2.s @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --64 -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea5.o: x86_64_mov_to_lea3.s -@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --x32 -o $@ $< +@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --x32 -mrelax-relocations=yes -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea6.o: x86_64_mov_to_lea3.s -@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --64 -o $@ $< +@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --64 -mrelax-relocations=yes -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea7.o: x86_64_mov_to_lea4.s @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --x32 -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_mov_to_lea8.o: x86_64_mov_to_lea4.s @@ -5528,8 +5528,6 @@ uninstall-am: @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@; \ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ exit 1; \ @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ fi -@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x86_64_overflow_pc32.o: x86_64_overflow_pc32.s -@DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x32_overflow_pc32.o: x86_64_overflow_pc32.s @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --x32 -o $@ $< @DEFAULT_TARGET_X86_64_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@x32_overflow_pc32.err: x32_overflow_pc32.o gcctestdir/ld -- 2.34.1