aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>2009-06-24 19:00:15 +0000
committerIan Lance Taylor <ian@airs.com>2009-06-24 19:00:15 +0000
commit554585003d351dea8db3181866b89ebc9bf2f66c (patch)
tree56f05b1e9a756075afd83c160ccf1d352b172a37
parent4e608b4f2ee7213a9b161ff91b9a8a852dac3486 (diff)
downloadgdb-554585003d351dea8db3181866b89ebc9bf2f66c.zip
gdb-554585003d351dea8db3181866b89ebc9bf2f66c.tar.gz
gdb-554585003d351dea8db3181866b89ebc9bf2f66c.tar.bz2
* script-sections.cc (Output_section_definition::
set_section_addresses): Rename shadowing local load_address to laddr.
-rw-r--r--gold/ChangeLog6
-rw-r--r--gold/script-sections.cc8
2 files changed, 10 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog
index 7c2feac..85326d1 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,5 +1,11 @@
2009-06-24 Ian Lance Taylor <iant@google.com>
+ * script-sections.cc (Output_section_definition::
+ set_section_addresses): Rename shadowing local load_address to
+ laddr.
+
+2009-06-24 Ian Lance Taylor <iant@google.com>
+
PR 10244
* reloc.cc (relocate_sections): Skip empty relocation sections.
diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index 23610ac..7396b3b 100644
--- a/gold/script-sections.cc
+++ b/gold/script-sections.cc
@@ -1863,12 +1863,12 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
else
{
Output_section* dummy;
- uint64_t load_address =
+ uint64_t laddr =
this->load_address_->eval_with_dot(symtab, layout, true, *dot_value,
this->output_section_, &dummy);
if (this->output_section_ != NULL)
- this->output_section_->set_load_address(load_address);
- this->evaluated_load_address_ = load_address;
+ this->output_section_->set_load_address(laddr);
+ this->evaluated_load_address_ = laddr;
}
uint64_t subalign;
@@ -3076,7 +3076,7 @@ Script_sections::create_note_and_tls_segments(
// Add a program header. The PHDRS clause is syntactically distinct
// from the SECTIONS clause, but we implement it with the SECTIONS
-// support becauase PHDRS is useless if there is no SECTIONS clause.
+// support because PHDRS is useless if there is no SECTIONS clause.
void
Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,