summaryrefslogtreecommitdiff
path: root/gold/output.cc
diff options
context:
space:
mode:
authorDoug Kwan <dougkwan@google.com>2009-12-17 00:00:26 +0000
committerDoug Kwan <dougkwan@google.com>2009-12-17 00:00:26 +0000
commit6aebf5f626fb39b17e9c5e91a7bc9d978b6eedc5 (patch)
tree96a613129c36e25d2a102ce5a8f6a2dc552b0479 /gold/output.cc
parentc67471708c1b2aa6073024043fa137db328ec00b (diff)
downloadbinutils-redhat-6aebf5f626fb39b17e9c5e91a7bc9d978b6eedc5.tar.gz
2009-12-16 Doug Kwan <dougkwan@google.com>
* arm.cc (Arm_relobj::scan_sections_for_stubs): Exclude ICF-eliminated sections. * object.cc (Sized_relobj::do_finalize_local_symbols): Handle relaxed input sections. * output.cc (Output_section::find_relaxed_input_section): Change return type to Output_relaxed_input_section pointer. Adjust code for new type of relaxed_input_section_map_. * output.h (Output_section::find_relaxed_input_section): Change return type to Output_relaxed_input_section pointer. (Output_section::Output_relaxed_input_section_by_input_section_map): New type. (Output_section::relaxed_input_section_map_): Change type to Output_section::Output_relaxed_input_section_by_input_section_map. * symtab.cc (Symbol_table::compute_final_value): Handle relaxed input section.
Diffstat (limited to 'gold/output.cc')
-rw-r--r--gold/output.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gold/output.cc b/gold/output.cc
index 61c2ba6f4b..440d4f2b57 100644
--- a/gold/output.cc
+++ b/gold/output.cc
@@ -2224,7 +2224,7 @@ Output_section::find_merge_section(const Relobj* object,
// Find an relaxed input section corresponding to an input section
// in OBJECT with index SHNDX.
-const Output_section_data*
+const Output_relaxed_input_section*
Output_section::find_relaxed_input_section(const Relobj* object,
unsigned int shndx) const
{
@@ -2247,7 +2247,7 @@ Output_section::find_relaxed_input_section(const Relobj* object,
}
Input_section_specifier iss(object, shndx);
- Output_section_data_by_input_section_map::const_iterator p =
+ Output_relaxed_input_section_by_input_section_map::const_iterator p =
this->relaxed_input_section_map_.find(iss);
if (p != this->relaxed_input_section_map_.end())
return p->second;