diff options
| author | Cary Coutant <ccoutant@google.com> | 2011-10-31 22:33:04 +0000 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2011-10-31 22:33:04 +0000 |
| commit | de4101c724d90aa753a39e04fd3e1f09c66e2c75 (patch) | |
| tree | 02c405c950e9ed2d3121c874da859b703acbe45c /gold | |
| parent | 7257cc92acfa8a53a200d9efa69913d3292c480f (diff) | |
| download | binutils-de4101c724d90aa753a39e04fd3e1f09c66e2c75.zip binutils-de4101c724d90aa753a39e04fd3e1f09c66e2c75.tar.gz binutils-de4101c724d90aa753a39e04fd3e1f09c66e2c75.tar.bz2 | |
PR gold/13359
* i386.cc (Target_i386::Relocate::relocate_tls): Remove
unnecessary assertion.
* x86_64.cc (Target_x86_64::Relocate::relocate_tls): Likewise.
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 7 | ||||
| -rw-r--r-- | gold/i386.cc | 6 | ||||
| -rw-r--r-- | gold/x86_64.cc | 6 |
3 files changed, 7 insertions, 12 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 172982c..fddf7d0 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,10 @@ +2011-10-31 Cary Coutant <ccoutant@google.com> + + PR gold/13359 + * i386.cc (Target_i386::Relocate::relocate_tls): Remove + unnecessary assertion. + * x86_64.cc (Target_x86_64::Relocate::relocate_tls): Likewise. + 2011-10-31 Sriraman Tallam <tmsriram@google.com> * symtab.h (Symbol_table::gc_mark_symbol_for_shlib): Rename to diff --git a/gold/i386.cc b/gold/i386.cc index 445bc68..191a915 100644 --- a/gold/i386.cc +++ b/gold/i386.cc @@ -2709,12 +2709,6 @@ Target_i386::Relocate::relocate_tls(const Relocate_info<32, false>* relinfo, } if (optimized_type == tls::TLSOPT_TO_IE) { - if (tls_segment == NULL) - { - gold_assert(parameters->errors()->error_count() > 0 - || issue_undefined_symbol_error(gsym)); - return; - } this->tls_gd_to_ie(relinfo, relnum, tls_segment, rel, r_type, got_offset, view, view_size); break; diff --git a/gold/x86_64.cc b/gold/x86_64.cc index e61d7d1..0762926 100644 --- a/gold/x86_64.cc +++ b/gold/x86_64.cc @@ -3181,12 +3181,6 @@ Target_x86_64::Relocate::relocate_tls(const Relocate_info<64, false>* relinfo, } if (optimized_type == tls::TLSOPT_TO_IE) { - if (tls_segment == NULL) - { - gold_assert(parameters->errors()->error_count() > 0 - || issue_undefined_symbol_error(gsym)); - return; - } value = target->got_plt_section()->address() + got_offset; this->tls_gd_to_ie(relinfo, relnum, tls_segment, rela, r_type, value, view, address, view_size); |