* script-sections.cc (Output_section_definition::
set_section_addresses): Rename shadowing local load_address to laddr.
This commit is contained in:
parent
4e608b4f2e
commit
554585003d
2 changed files with 10 additions and 4 deletions
|
@ -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>
|
2009-06-24 Ian Lance Taylor <iant@google.com>
|
||||||
|
|
||||||
PR 10244
|
PR 10244
|
||||||
|
|
|
@ -1863,12 +1863,12 @@ Output_section_definition::set_section_addresses(Symbol_table* symtab,
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Output_section* dummy;
|
Output_section* dummy;
|
||||||
uint64_t load_address =
|
uint64_t laddr =
|
||||||
this->load_address_->eval_with_dot(symtab, layout, true, *dot_value,
|
this->load_address_->eval_with_dot(symtab, layout, true, *dot_value,
|
||||||
this->output_section_, &dummy);
|
this->output_section_, &dummy);
|
||||||
if (this->output_section_ != NULL)
|
if (this->output_section_ != NULL)
|
||||||
this->output_section_->set_load_address(load_address);
|
this->output_section_->set_load_address(laddr);
|
||||||
this->evaluated_load_address_ = load_address;
|
this->evaluated_load_address_ = laddr;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t subalign;
|
uint64_t subalign;
|
||||||
|
@ -3076,7 +3076,7 @@ Script_sections::create_note_and_tls_segments(
|
||||||
|
|
||||||
// Add a program header. The PHDRS clause is syntactically distinct
|
// Add a program header. The PHDRS clause is syntactically distinct
|
||||||
// from the SECTIONS clause, but we implement it with the SECTIONS
|
// 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
|
void
|
||||||
Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,
|
Script_sections::add_phdr(const char* name, size_t namelen, unsigned int type,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue