From e81fea4d172699b2e986bc541f812cac0995da6b Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 9 Sep 2012 03:43:51 +0000 Subject: * target.h (Target::gc_mark_symbol, do_gc_mark_symbol): New functions. (Sized_target::gc_add_reference, do_gc_add_reference): New functions. * gc.h (gc_process_relocs): Call target gc_add_reference. * gold.cc (queue_middle_tasks): Use gc_mark_symbol on start sym. * symtab.cc (Symbol_table::gc_mark_undef_symbols): Use gc_mark_symbol. (Symbol_table::gc_mark_symbol): Call target gc_mark_symbol. Remove unnecessary cast. * powerpc.cc (Powerpc_relobj::get_opd_ent): Rearrange parameters to cater for when we don't need code offset. Update use. (Powerpc_relobj::access_from_map_, opd_valid_): New vars. (Powerpc_relobj::access_from_map, add_reference, opd_valid, set_opd_valid): New functions. (Target_powerpc::do_gc_add_reference): New function. (Target_powerpc::gc_process_relocs): Call gc()->add_reference on stashed refs. (Target_powerpc::do_gc_mark_symbol): New function. --- gold/gc.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'gold/gc.h') diff --git a/gold/gc.h b/gold/gc.h index 56b5e74fd88..a1691514273 100644 --- a/gold/gc.h +++ b/gold/gc.h @@ -187,8 +187,6 @@ gc_process_relocs( size_t local_count, const unsigned char* plocal_syms) { - Object* dst_obj; - unsigned int dst_indx; Scan scan; typedef typename Reloc_types::Reloc Reltype; @@ -235,6 +233,9 @@ gc_process_relocs( unsigned int r_type = elfcpp::elf_r_type(r_info); typename elfcpp::Elf_types::Elf_Swxword addend = Reloc_types::get_reloc_addend_noerror(&reloc); + Object* dst_obj; + unsigned int dst_indx; + typename elfcpp::Elf_types::Elf_Addr dst_off; if (r_sym < local_count) { @@ -246,6 +247,8 @@ gc_process_relocs( shndx = src_obj->adjust_sym_shndx(r_sym, shndx, &is_ordinary); dst_obj = src_obj; dst_indx = shndx; + dst_off = lsym.get_st_value(); + if (is_icf_tracked) { if (is_ordinary) @@ -288,11 +291,13 @@ gc_process_relocs( dst_obj = NULL; dst_indx = 0; + dst_off = 0; bool is_ordinary = false; if (gsym->source() == Symbol::FROM_OBJECT) { dst_obj = gsym->object(); dst_indx = gsym->shndx(&is_ordinary); + dst_off = static_cast*>(gsym)->value(); } // When doing safe folding, check to see if this relocation is that @@ -348,6 +353,10 @@ gc_process_relocs( if (parameters->options().gc_sections()) { symtab->gc()->add_reference(src_obj, src_indx, dst_obj, dst_indx); + dst_off += addend; + parameters->sized_target() + ->gc_add_reference(symtab, src_obj, src_indx, + dst_obj, dst_indx, dst_off); if (cident_section_name != NULL) { Garbage_collection::Cident_section_map::iterator ele = -- cgit v1.2.1