diff options
| author | Alan Modra <amodra@gmail.com> | 2012-09-05 00:34:20 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2012-09-05 00:34:20 +0000 |
| commit | 7404fe1b8d20b30162a7e56307d5a2d400cb5645 (patch) | |
| tree | 71cfb8fde4ad34ab2eb812996ad807feec50828b /gold/output.cc | |
| parent | f54ae065b8f805b626729a8f60bacf8312a182db (diff) | |
* object.h (Sized_relobj_file::emit_relocs): Delete.
(Sized_relobj_file::emit_relocs_reltype): Delete.
* reloc.cc (Sized_relobj_file::do_relocate_sections): Call target
relocate_relocs for --emit-relocs.
(Sized_relobj_file::emit_relocs, emit_relocs_reltype): Delete.
* output.h: Update comment.
(Output_segment::first_section): New function.
(Output_segment::first_section_load_address): Use first_section.
* output.cc (Output_segment::first_section): New function extracted..
(Output_segment::first_section_load_address): ..from here. Delete.
* target-reloc.h (relocate_for_relocatable): Rename to relocate_relocs.
* target.h (Sized_target::relocate_for_relocatable): Likewise.
* arm.cc (Target_arm::relocate_for_relocatable): Likewise, and
adjust call to target.h function.
* i386.cc (Target_i386): Likewise.
* sparc.cc (Target_sparc): Likewise.
* x86_64.cc (Target_x86_64): Likewise.
* powerpc.cc (Target_powerpc): Likewise.
(Target_powerpc::Scan::local, global): Handle R_POWERPC_TLS. Ensure
first tls section has section symbol for optimised local dynamic
output relocs.
(Target_powerpc::Relocate::relocate): Correct local dynamic value.
(Target_powerpc::relocate_relocs): Adjust relocs emitted for
optimised tls code.
* testsuite/testfile.cc (Target_test::relocate_for_relocatable):
Rename to relocate_relocs. Update error message.
Diffstat (limited to 'gold/output.cc')
| -rw-r--r-- | gold/output.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gold/output.cc b/gold/output.cc index 68fe573f86..664e408bb1 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -4613,10 +4613,10 @@ Output_segment::set_tls_offsets() (*p)->set_tls_offset(this->vaddr_); } -// Return the load address of the first section. +// Return the first section. -uint64_t -Output_segment::first_section_load_address() const +Output_section* +Output_segment::first_section() const { for (int i = 0; i < static_cast<int>(ORDER_MAX); ++i) { @@ -4626,9 +4626,7 @@ Output_segment::first_section_load_address() const ++p) { if ((*p)->is_section()) - return ((*p)->has_load_address() - ? (*p)->load_address() - : (*p)->address()); + return (*p)->output_section(); } } gold_unreachable(); |