diff options
| author | Cary Coutant <ccoutant@gmail.com> | 2016-08-17 10:53:31 -0700 |
|---|---|---|
| committer | Cary Coutant <ccoutant@gmail.com> | 2016-08-17 10:53:31 -0700 |
| commit | a4aa1f5f01456222b47096e19018a8adc251cd58 (patch) | |
| tree | 210c9ae197db57d529f118a67b77a6ef586d5f42 /gold/i386.cc | |
| parent | 9b19e39006796a4dc90f9801f44bb6f07fdb6386 (diff) | |
| download | fsf-binutils-gdb-a4aa1f5f01456222b47096e19018a8adc251cd58.zip fsf-binutils-gdb-a4aa1f5f01456222b47096e19018a8adc251cd58.tar.gz fsf-binutils-gdb-a4aa1f5f01456222b47096e19018a8adc251cd58.tar.bz2 | |
Fix extraneous complaints about missing expected TLS relocation (i386).
Build the test objects with the in-tree assembler. Also fix some cascading
error messages caused by not resetting the skip_call_tls_get_addr_ flag
after printing the error.
gold/
* i386.cc (Target_i386): Reset skip_call_tls_get_addr_ after printing
error message.
* testsuite/Makefile.am (pr20216a): Add missing dependencies.
(pr20308a): Add -Bgcctestdir/ to compile rules.
* testsuite/Makefile.in: Regenerate.
Diffstat (limited to 'gold/i386.cc')
| -rw-r--r-- | gold/i386.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gold/i386.cc b/gold/i386.cc index 28864cd..ec515c4 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -2794,8 +2794,11 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, && r_type != elfcpp::R_386_PC32) || gsym == NULL || strcmp(gsym->name(), "___tls_get_addr") != 0) - gold_error_at_location(relinfo, relnum, rel.get_r_offset(), - _("missing expected TLS relocation")); + { + gold_error_at_location(relinfo, relnum, rel.get_r_offset(), + _("missing expected TLS relocation")); + this->skip_call_tls_get_addr_ = false; + } else { this->skip_call_tls_get_addr_ = false; |