From de4101c724d90aa753a39e04fd3e1f09c66e2c75 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Mon, 31 Oct 2011 22:33:04 +0000 Subject: [PATCH] PR gold/13359 * i386.cc (Target_i386::Relocate::relocate_tls): Remove unnecessary assertion. * x86_64.cc (Target_x86_64::Relocate::relocate_tls): Likewise. --- gold/ChangeLog | 7 +++++++ gold/i386.cc | 6 ------ 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 + + 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 * 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); -- 2.7.4