From efc6fa128f00d61014f56530724767ea048bf594 Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Sat, 2 May 2015 08:40:09 -0700 Subject: Change Section_id type to use Relobj* instead of Object*. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2015-04-29 Cary Coutant Rafael Ávila de Espíndola gold/ * gc.h (Garbage_collection::is_section_garbage): Change Object* to Relobj*. (Garbage_collection::add_reference): Likewise. (Garbage_collection::gc_process_relocs): Likewise. Don't push object/shndx pair onto *secvec for dynamic objects. Don't follow relocations pointing to dynamic objects for GC. * icf.cc (Icf::find_identical_sections): Change Object* to Relobj*. (Icf::unfold_section): Likewise. (Icf::is_section_folded): Likewise. (Icf::get_folded_section): Likewise. * icf.h: (Icf::get_folded_section): Likewise. (Icf::unfold_section): Likewise. (Icf::is_section_folded): Likewise. (Icf::section_has_function_pointers): Likewise. (Icf::set_section_has_function_pointers): Likewise. * object.h (Section_id): Likewise. (Const_section_id): Likewise. * output.cc (Output_section::update_section_layout): Likewise. * output.h: (Output_section_lookup_maps::find_relaxed_input_section): Likewise. * plugin.cc (update_section_order): Likewise. (unique_segment_for_sections): Likewise. * powerpc.cc (Powerpc_relobj::add_reference): Likewise. (Target_powerpc::do_gc_add_reference): Likewise. (Target_powerpc::gc_process_relocs): Likewise. (Target_powerpc::do_gc_add_reference): Likewise. * symtab.cc (Symbol_table::is_section_folded): Likewise. (Symbol_table::gc_mark_symbol): Likewise. * symtab.h: (Symbol_table::is_section_folded): Likewise. * target.h: (Sized_target::gc_add_reference): Likewise. (Sized_target::do_gc_add_reference): Likewise. --- gold/symtab.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gold/symtab.cc') diff --git a/gold/symtab.cc b/gold/symtab.cc index d2ed352..925296a 100644 --- a/gold/symtab.cc +++ b/gold/symtab.cc @@ -585,7 +585,7 @@ Symbol_table::Symbol_table_eq::operator()(const Symbol_table_key& k1, } bool -Symbol_table::is_section_folded(Object* obj, unsigned int shndx) const +Symbol_table::is_section_folded(Relobj* obj, unsigned int shndx) const { return (parameters->options().icf_enabled() && this->icf_->is_section_folded(obj, shndx)); @@ -650,10 +650,11 @@ Symbol_table::gc_mark_symbol(Symbol* sym) // Add the object and section to the work list. bool is_ordinary; unsigned int shndx = sym->shndx(&is_ordinary); - if (is_ordinary && shndx != elfcpp::SHN_UNDEF) + if (is_ordinary && shndx != elfcpp::SHN_UNDEF && !sym->object()->is_dynamic()) { gold_assert(this->gc_!= NULL); - this->gc_->worklist().push_back(Section_id(sym->object(), shndx)); + Relobj* relobj = static_cast(sym->object()); + this->gc_->worklist().push_back(Section_id(relobj, shndx)); } parameters->target().gc_mark_symbol(this, sym); } -- cgit v1.1