diff options
| author | Alan Modra <amodra@gmail.com> | 2013-03-15 07:51:32 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2013-03-15 07:51:32 +0000 |
| commit | ad3d8a2f047cb50d8a18c01c1d0dad03e32df5d1 (patch) | |
| tree | 4a7064d3f5793dd85b233b401e7168ec01e676e4 | |
| parent | 0a251e08fa4e7130f05462ecc9f60e6683cdefca (diff) | |
| download | fsf-binutils-gdb-ad3d8a2f047cb50d8a18c01c1d0dad03e32df5d1.zip fsf-binutils-gdb-ad3d8a2f047cb50d8a18c01c1d0dad03e32df5d1.tar.gz fsf-binutils-gdb-ad3d8a2f047cb50d8a18c01c1d0dad03e32df5d1.tar.bz2 | |
* gc.h (gc_process_relocs): Don't look through function descriptors.
* icf.cc (get_section_contents): Do so here instead.
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/gc.h | 32 | ||||
| -rw-r--r-- | gold/icf.cc | 19 |
3 files changed, 26 insertions, 30 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 6913ace..6be58e9 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2013-03-15 Alan Modra <amodra@gmail.com> + + * gc.h (gc_process_relocs): Don't look through function descriptors. + * icf.cc (get_section_contents): Do so here instead. + 2013-03-13 Alan Modra <amodra@gmail.com> * powerpc.cc (is_branch_reloc): Forward declare. @@ -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<off_t, Address>(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<off_t, Address>(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); diff --git a/gold/icf.cc b/gold/icf.cc index 5935c5b..a58e34f 100644 --- a/gold/icf.cc +++ b/gold/icf.cc @@ -288,6 +288,25 @@ get_section_contents(bool first_iteration, for (; it_v != v.end(); ++it_v, ++it_s, ++it_a, ++it_o, ++it_addend_size) { + if (first_iteration + && it_v->first != NULL) + { + Symbol_location loc; + loc.object = it_v->first; + loc.shndx = it_v->second; + loc.offset = convert_types<off_t, long long>(it_a->first + + it_a->second); + // Look through function descriptors + parameters->target().function_location(&loc); + if (loc.shndx != it_v->second) + { + it_v->second = loc.shndx; + // Modify symvalue/addend to the code entry. + it_a->first = loc.offset; + it_a->second = 0; + } + } + // ADDEND_STR stores the symbol value and addend and offset, // each at most 16 hex digits long. it_a points to a pair // where first is the symbol value and second is the |