aboutsummaryrefslogtreecommitdiff
path: root/gold/icf.cc
diff options
context:
space:
mode:
authorSriraman Tallam <tmsriram@google.com>2010-04-23 18:49:23 +0000
committerSriraman Tallam <tmsriram@google.com>2010-04-23 18:49:23 +0000
commitef38fd8a0b29ff3e53add753ef8fe3bd6c242542 (patch)
tree6d29ce7771c56159269d1eb53ab1dc407a8d2b1c /gold/icf.cc
parent88a1906b0da33e2905cce61e133b67cdde314847 (diff)
downloadgdb-ef38fd8a0b29ff3e53add753ef8fe3bd6c242542.zip
gdb-ef38fd8a0b29ff3e53add753ef8fe3bd6c242542.tar.gz
gdb-ef38fd8a0b29ff3e53add753ef8fe3bd6c242542.tar.bz2
2010-04-23 Sriraman Tallam <tmsriram@google.com>
* gc.h (gc_process_relocs): Pass information on relocs pointing to sections that are not ordinary to icf. * icf.cc (get_section_contents): Handle relocation pointing to section with no object or shndx information. * testsuite/Makefile.am: Remove icf_virtual_function_folding_test.sh * testsuite/Makefile.in: Regenerate. * testsuite/icf_virtual_function_folding_test.cc: Remove printf. * testsuite/icf_virtual_function_folding_test.sh: Delete file.
Diffstat (limited to 'gold/icf.cc')
-rw-r--r--gold/icf.cc24
1 files changed, 22 insertions, 2 deletions
diff --git a/gold/icf.cc b/gold/icf.cc
index 5040a6e..47b6c60 100644
--- a/gold/icf.cc
+++ b/gold/icf.cc
@@ -263,8 +263,11 @@ get_section_contents(bool first_iteration,
{
Icf::Sections_reachable_info v =
(it_reloc_info_list->second).section_info;
+ // Stores the information of the symbol pointed to by the reloc.
Icf::Symbol_info s = (it_reloc_info_list->second).symbol_info;
+ // Stores the addend and the symbol value.
Icf::Addend_info a = (it_reloc_info_list->second).addend_info;
+ // Stores the offset of the reloc.
Icf::Offset_info o = (it_reloc_info_list->second).offset_info;
Icf::Sections_reachable_info::iterator it_v = v.begin();
Icf::Symbol_info::iterator it_s = s.begin();
@@ -285,6 +288,24 @@ get_section_contents(bool first_iteration,
static_cast<long long>((*it_a).first),
static_cast<long long>((*it_a).second),
static_cast<unsigned long long>(*it_o));
+
+ // If the symbol pointed to by the reloc is not in an ordinary
+ // section or if the symbol type is not FROM_OBJECT, then the
+ // object is NULL.
+ if (it_v->first == NULL)
+ {
+ if (first_iteration)
+ {
+ // If the symbol name is available, use it.
+ if ((*it_s) != NULL)
+ buffer.append((*it_s)->name());
+ // Append the addend.
+ buffer.append(addend_str);
+ buffer.append("@");
+ }
+ continue;
+ }
+
Section_id reloc_secn(it_v->first, it_v->second);
// If this reloc turns back and points to the same section,
@@ -406,8 +427,7 @@ get_section_contents(bool first_iteration,
else if ((*it_s) != NULL)
{
// If symbol name is available use that.
- const char *sym_name = (*it_s)->name();
- buffer.append(sym_name);
+ buffer.append((*it_s)->name());
// Append the addend.
buffer.append(addend_str);
buffer.append("@");