From f571390111e28717935ea1b6edd1afc902c5c61c Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Wed, 10 Aug 2016 10:57:42 -0700 Subject: [PATCH] Fix extraneous complaints about missing expected TLS relocation. With some versions of gas, the call to tls_get_addr uses a GOTPCREL relocation instead of a GOTPCRELX relocation. We should allow for that when skip_call_tls_get_addr_ is true. We should also build the test objects with the in-tree assembler. This patch also fixes some cascading error messages caused by not resetting the skip_call_tls_get_addr_ flag after printing the error. gold/ PR gold/20216 * x86_64.cc (Target_x86_64::Relocate::relocate): Add check for R_X86_64_GOTPCREL. Reset skip_call_tls_get_addr_ after printing error message. * testsuite/Makefile.am (pr20216_gd.o): Add -Bgcctestdir/. (pr20216_ld.o): Likewise. * testsuite/Makefile.in: Regenerate. --- gold/ChangeLog | 10 ++++++++++ gold/testsuite/Makefile.am | 4 ++-- gold/testsuite/Makefile.in | 4 ++-- gold/x86_64.cc | 2 ++ 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 10677c762c..687e56e282 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,13 @@ +2016-08-10 Cary Coutant + + PR gold/20216 + * x86_64.cc (Target_x86_64::Relocate::relocate): Add check for + R_X86_64_GOTPCREL. Reset skip_call_tls_get_addr_ after printing + error message. + * testsuite/Makefile.am (pr20216_gd.o): Add -Bgcctestdir/. + (pr20216_ld.o): Likewise. + * testsuite/Makefile.in: Regenerate. + 2016-08-10 James Clarke PR gold/20443 diff --git a/gold/testsuite/Makefile.am b/gold/testsuite/Makefile.am index 39f9e9efcd..739458cd23 100644 --- a/gold/testsuite/Makefile.am +++ b/gold/testsuite/Makefile.am @@ -1193,10 +1193,10 @@ pr20216b.so: pr20216_def.o gcctestdir/ld $(LINK) -Bgcctestdir/ -shared pr20216_def.o pr20216_gd.o: pr20216_gd.S - $(COMPILE) -c -o $@ $< + $(COMPILE) -Bgcctestdir/ -c -o $@ $< pr20216_ld.o: pr20216_ld.S - $(COMPILE) -c -o $@ $< + $(COMPILE) -Bgcctestdir/ -c -o $@ $< endif DEFAULT_TARGET_X86_64_OR_X32 diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in index bd58d13442..15844e2b5a 100644 --- a/gold/testsuite/Makefile.in +++ b/gold/testsuite/Makefile.in @@ -6151,10 +6151,10 @@ uninstall-am: @DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(LINK) -Bgcctestdir/ -shared pr20216_def.o @DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20216_gd.o: pr20216_gd.S -@DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< +@DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -Bgcctestdir/ -c -o $@ $< @DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@pr20216_ld.o: pr20216_ld.S -@DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -c -o $@ $< +@DEFAULT_TARGET_X86_64_OR_X32_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(COMPILE) -Bgcctestdir/ -c -o $@ $< @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@i386_mov_to_lea1.o: i386_mov_to_lea1.s @DEFAULT_TARGET_I386_TRUE@@GCC_TRUE@@NATIVE_LINKER_TRUE@ $(TEST_AS) --32 -o $@ $< diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 6aa489a7a7..8d494ea175 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -3505,6 +3505,7 @@ Target_x86_64::Relocate::relocate( if (this->skip_call_tls_get_addr_) { if ((r_type != elfcpp::R_X86_64_PLT32 + && r_type != elfcpp::R_X86_64_GOTPCREL && r_type != elfcpp::R_X86_64_GOTPCRELX && r_type != elfcpp::R_X86_64_PLT32_BND && r_type != elfcpp::R_X86_64_PC32_BND @@ -3514,6 +3515,7 @@ Target_x86_64::Relocate::relocate( { gold_error_at_location(relinfo, relnum, rela.get_r_offset(), _("missing expected TLS relocation")); + this->skip_call_tls_get_addr_ = false; } else {