diff options
| author | Cary Coutant <ccoutant@google.com> | 2009-01-30 00:21:46 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2009-01-30 00:21:46 +0000 |
| commit | 5efc7cd2d630cf8acc716a45d0cb1025096fd308 (patch) | |
| tree | 45bd86760f7f0f38903f02e0266fae68693434f3 | |
| parent | 55b0d6e3cfd9d502e161345b2826f662bdff9c83 (diff) | |
| download | fsf-binutils-gdb-5efc7cd2d630cf8acc716a45d0cb1025096fd308.zip fsf-binutils-gdb-5efc7cd2d630cf8acc716a45d0cb1025096fd308.tar.gz fsf-binutils-gdb-5efc7cd2d630cf8acc716a45d0cb1025096fd308.tar.bz2 | |
* i386.cc (Target_i386::Relocate::relocate): Recognize non-PIC calls
to __tls_get_addr.
* x86_64.cc (Target_x86_64::Relocate::relocate): Likewise.
* ChangeLog: Fixed typo in previous ChangeLog entry (version 1.9).
| -rw-r--r-- | gold/ChangeLog | 8 | ||||
| -rw-r--r-- | gold/i386.cc | 3 | ||||
| -rw-r--r-- | gold/x86_64.cc | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index bae5102..56fc48e 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,6 +1,12 @@ +2009-01-29 Cary Coutant <ccoutant@google.com> + + * i386.cc (Target_i386::Relocate::relocate): Recognize non-PIC calls + to __tls_get_addr. + * x86_64.cc (Target_x86_64::Relocate::relocate): Likewise. + 2009-01-28 Ian Lance Taylor <iant@google.com> - * version.cc (version_string): Bump to 1.8. + * version.cc (version_string): Bump to 1.9. * gold.h: Include <cstring> and <stdint.h>. * version.cc: Include <cstdio>. diff --git a/gold/i386.cc b/gold/i386.cc index 3779d4e..e033d34 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -1633,7 +1633,8 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, { if (this->skip_call_tls_get_addr_) { - if (r_type != elfcpp::R_386_PLT32 + if ((r_type != elfcpp::R_386_PLT32 + && 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(), diff --git a/gold/x86_64.cc b/gold/x86_64.cc index 1724624..4dfe75b 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -1703,7 +1703,8 @@ Target_x86_64::Relocate::relocate(const Relocate_info<64, false>* relinfo, { if (this->skip_call_tls_get_addr_) { - if (r_type != elfcpp::R_X86_64_PLT32 + if ((r_type != elfcpp::R_X86_64_PLT32 + && r_type != elfcpp::R_X86_64_PC32) || gsym == NULL || strcmp(gsym->name(), "__tls_get_addr") != 0) { |