* script-sections.cc (Output_section_definition::

	set_section_addresses): Rename shadowing local load_address to
	laddr.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 7c2feacbcf00e58eafa12e35e1e99a92ef7c1c3c..85326d12a6ae86d154fb32f0ae7cb5d853268ec9 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gold/script-sections.cc b/gold/script-sections.cc
index 23610aced422ea9322a404351965c436ec75f50f..7396b3bf2485362b6f795225bd0fa2f470292447 100644 (file)
--- 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,