From ad3d8a2f047cb50d8a18c01c1d0dad03e32df5d1 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 15 Mar 2013 07:51:32 +0000 Subject: * gc.h (gc_process_relocs): Don't look through function descriptors. * icf.cc (get_section_contents): Do so here instead. --- gold/gc.h | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) (limited to 'gold/gc.h') diff --git a/gold/gc.h b/gold/gc.h index 6930ace..4224a66 100644 --- a/gold/gc.h +++ b/gold/gc.h @@ -253,21 +253,7 @@ gc_process_relocs( { Address symvalue = dst_off - addend; if (is_ordinary) - { - Symbol_location loc; - loc.object = dst_obj; - loc.shndx = dst_indx; - loc.offset = convert_types(dst_off); - // Look through function descriptors. - parameters->target().function_location(&loc); - if (loc.shndx != dst_indx) - { - // Modify symvalue/addend to the code entry. - symvalue = loc.offset; - addend = 0; - } - (*secvec).push_back(Section_id(loc.object, loc.shndx)); - } + (*secvec).push_back(Section_id(dst_obj, dst_indx)); else (*secvec).push_back(Section_id(NULL, 0)); (*symvec).push_back(NULL); @@ -343,21 +329,7 @@ gc_process_relocs( { Address symvalue = dst_off - addend; if (is_ordinary && gsym->source() == Symbol::FROM_OBJECT) - { - Symbol_location loc; - loc.object = dst_obj; - loc.shndx = dst_indx; - loc.offset = convert_types(dst_off); - // Look through function descriptors. - parameters->target().function_location(&loc); - if (loc.shndx != dst_indx) - { - // Modify symvalue/addend to the code entry. - symvalue = loc.offset; - addend = 0; - } - (*secvec).push_back(Section_id(loc.object, loc.shndx)); - } + (*secvec).push_back(Section_id(dst_obj, dst_indx)); else (*secvec).push_back(Section_id(NULL, 0)); (*symvec).push_back(gsym); -- cgit v1.1