diff options
author | Alan Modra <amodra@gmail.com> | 2012-08-14 02:22:32 +0000 |
---|---|---|
committer | Alan Modra <amodra@gmail.com> | 2012-08-14 02:22:32 +0000 |
commit | 6ce7895693dea7d683fb832d059ed020cffbf65b (patch) | |
tree | 101ebbd62b7735f9ed3fd42c9bdc38bd7f2547c1 | |
parent | d1a8cabd8fd4d4a74294a54045ef3d08e93969f4 (diff) | |
download | fsf-binutils-gdb-6ce7895693dea7d683fb832d059ed020cffbf65b.zip fsf-binutils-gdb-6ce7895693dea7d683fb832d059ed020cffbf65b.tar.gz fsf-binutils-gdb-6ce7895693dea7d683fb832d059ed020cffbf65b.tar.bz2 |
elfcpp/
* powerpc.h: Add more relocs.
(R_PPC_REL16*): Rename to R_POWERPC_REL16*.
gold/
* powerpc.cc: Update for renamed R_PPC_REL16 relocs.
(Output_data_got_powerpc::do_write): Don't rely on base class lookup
for replace_constant call.
(Output_data_plt_powerpc::do_print_to_mapfile): New function.
(Output_data_glink::do_print_to_mapfile): New function.
(Target_powerpc::Scan::local): Ignore R_PPC64_TOCSAVE.
(Target_powerpc::Relocate::relocate): Likewise.
-rw-r--r-- | elfcpp/ChangeLog | 5 | ||||
-rw-r--r-- | elfcpp/powerpc.h | 46 | ||||
-rw-r--r-- | gold/ChangeLog | 10 | ||||
-rw-r--r-- | gold/powerpc.cc | 58 |
4 files changed, 87 insertions, 32 deletions
diff --git a/elfcpp/ChangeLog b/elfcpp/ChangeLog index 4c25a87..90b7229 100644 --- a/elfcpp/ChangeLog +++ b/elfcpp/ChangeLog @@ -1,3 +1,8 @@ +2012-08-14 Alan Modra <amodra@gmail.com> + + * powerpc.h: Add more relocs. + (R_PPC_REL16*): Rename to R_POWERPC_REL16*. + 2012-05-11 H.J. Lu <hongjiu.lu@intel.com> PR gold/14091 diff --git a/elfcpp/powerpc.h b/elfcpp/powerpc.h index 2bcb3ca..2c803af 100644 --- a/elfcpp/powerpc.h +++ b/elfcpp/powerpc.h @@ -1,6 +1,6 @@ // powerpc.h -- ELF definitions specific to EM_PPC and EM_PPC64 -*- C++ -*- -// Copyright 2008, 2010 Free Software Foundation, Inc. +// Copyright 2008, 2010, 2012 Free Software Foundation, Inc. // Written by David S. Miller <davem@davemloft.net>. // This file is part of elfcpp. @@ -137,27 +137,32 @@ enum R_POWERPC_GOT_DTPREL16_LO = 92, R_POWERPC_GOT_DTPREL16_HI = 93, R_POWERPC_GOT_DTPREL16_HA = 94, + R_PPC_TLSGD = 95, R_PPC64_TPREL16_DS = 95, + R_PPC_TLSLD = 96, R_PPC64_TPREL16_LO_DS = 96, R_PPC64_TPREL16_HIGHER = 97, R_PPC64_TPREL16_HIGHERA = 98, R_PPC64_TPREL16_HIGHEST = 99, R_PPC64_TPREL16_HIGHESTA = 100, - R_PPC64_DTPREL16_DS = 101, - R_PPC64_DTPREL16_LO_DS = 102, - R_PPC64_DTPREL16_HIGHER = 103, - R_PPC64_DTPREL16_HIGHERA = 104, - R_PPC64_DTPREL16_HIGHEST = 105, - R_PPC64_DTPREL16_HIGHESTA = 106, R_PPC_EMB_NADDR32 = 101, + R_PPC64_DTPREL16_DS = 101, R_PPC_EMB_NADDR16 = 102, + R_PPC64_DTPREL16_LO_DS = 102, R_PPC_EMB_NADDR16_LO = 103, + R_PPC64_DTPREL16_HIGHER = 103, R_PPC_EMB_NADDR16_HI = 104, + R_PPC64_DTPREL16_HIGHERA = 104, R_PPC_EMB_NADDR16_HA = 105, + R_PPC64_DTPREL16_HIGHEST = 105, R_PPC_EMB_SDAI16 = 106, + R_PPC64_DTPREL16_HIGHESTA = 106, R_PPC_EMB_SDA2I16 = 107, + R_PPC64_TLSGD = 107, R_PPC_EMB_SDA2REL = 108, + R_PPC64_TLSLD = 108, R_PPC_EMB_SDA21 = 109, + R_PPC64_TOCSAVE = 109, R_PPC_EMB_MRKREF = 110, R_PPC_EMB_RELSEC16 = 111, R_PPC_EMB_RELST_LO = 112, @@ -166,11 +171,30 @@ enum R_PPC_EMB_BIT_FLD = 115, R_PPC_EMB_RELSDA = 116, + R_PPC_VLE_REL8 = 216, + R_PPC_VLE_REL15 = 217, + R_PPC_VLE_REL24 = 218, + R_PPC_VLE_LO16A = 219, + R_PPC_VLE_LO16D = 220, + R_PPC_VLE_HI16A = 221, + R_PPC_VLE_HI16D = 222, + R_PPC_VLE_HA16A = 223, + R_PPC_VLE_HA16D = 224, + R_PPC_VLE_SDA21 = 225, + R_PPC_VLE_SDA21_LO = 226, + R_PPC_VLE_SDAREL_LO16A = 227, + R_PPC_VLE_SDAREL_LO16D = 228, + R_PPC_VLE_SDAREL_HI16A = 229, + R_PPC_VLE_SDAREL_HI16D = 230, + R_PPC_VLE_SDAREL_HA16A = 231, + R_PPC_VLE_SDAREL_HA16D = 232, + + R_PPC64_JMP_IREL = 247, R_POWERPC_IRELATIVE = 248, - R_PPC_REL16 = 249, - R_PPC_REL16_LO = 250, - R_PPC_REL16_HI = 251, - R_PPC_REL16_HA = 252, + R_POWERPC_REL16 = 249, + R_POWERPC_REL16_LO = 250, + R_POWERPC_REL16_HI = 251, + R_POWERPC_REL16_HA = 252, R_POWERPC_GNU_VTINHERIT = 253, R_POWERPC_GNU_VTENTRY = 254, R_PPC_TOC16 = 255, diff --git a/gold/ChangeLog b/gold/ChangeLog index 5083873..d7ccce7 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,5 +1,15 @@ 2012-08-14 Alan Modra <amodra@gmail.com> + * powerpc.cc: Update for renamed R_PPC_REL16 relocs. + (Output_data_got_powerpc::do_write): Don't rely on base class lookup + for replace_constant call. + (Output_data_plt_powerpc::do_print_to_mapfile): New function. + (Output_data_glink::do_print_to_mapfile): New function. + (Target_powerpc::Scan::local): Ignore R_PPC64_TOCSAVE. + (Target_powerpc::Relocate::relocate): Likewise. + +2012-08-14 Alan Modra <amodra@gmail.com> + * powerpc.cc (Powerpc_relobj::set_got2_shndx): Delete. (Powerpc_relobj::do_find_special_sections): Don't use set_got2_shndx. (Output_data_glink::add_entry,find_entry): Remove shndx param. diff --git a/gold/powerpc.cc b/gold/powerpc.cc index eb094b6..3c84fd6 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -654,7 +654,7 @@ public: This::addr16_hi(view, value + 0x8000, addend); } - // R_PPC_REL16: (Symbol + Addend - Address) & 0xffff + // R_POWERPC_REL16: (Symbol + Addend - Address) & 0xffff static inline void rel16(unsigned char* view, typename elfcpp::Elf_types<size>::Elf_Addr value, @@ -662,7 +662,7 @@ public: typename elfcpp::Elf_types<size>::Elf_Addr address) { This_reloc::pcrela16(view, value, addend, address); } - // R_PPC_REL16_LO: (Symbol + Addend - Address) & 0xffff + // R_POWERPC_REL16_LO: (Symbol + Addend - Address) & 0xffff static inline void rel16_lo(unsigned char* view, typename elfcpp::Elf_types<size>::Elf_Addr value, @@ -670,7 +670,7 @@ public: typename elfcpp::Elf_types<size>::Elf_Addr address) { This_reloc::pcrela16(view, value, addend, address); } - // R_PPC_REL16_HI: ((Symbol + Addend - Address) >> 16) & 0xffff + // R_POWERPC_REL16_HI: ((Symbol + Addend - Address) >> 16) & 0xffff static inline void rel16_hi(unsigned char* view, typename elfcpp::Elf_types<size>::Elf_Addr value, @@ -680,7 +680,7 @@ public: This::template rela<16>(view, 16, 0xffff, value - address, addend); } - // R_PPC_REL16_HA: Same as R_PPC_REL16_HI except that if the + // R_POWERPC_REL16_HA: Same as R_POWERPC_REL16_HI except that if the // final value of the low 16 bits of the // relocation is negative, add one. static inline void @@ -806,10 +806,10 @@ public: void do_write(Output_file* of) { - replace_constant(this->header_index_, - (size == 32 - ? this->layout_->dynamic_section()->address() - : this->address() + 0x8000)); + this->replace_constant(this->header_index_, + (size == 32 + ? this->layout_->dynamic_section()->address() + : this->address() + 0x8000)); Output_data_got<size, big_endian>::do_write(of); } @@ -944,6 +944,11 @@ class Output_data_plt_powerpc : public Output_section_data_build os->set_entsize(0); } + // Write to a map file. + void + do_print_to_mapfile(Mapfile* mapfile) const + { mapfile->print_output_data(this, _("** PLT")); } + private: // The size of an entry in the PLT. static const int plt_entry_size = size == 32 ? 4 : 24; @@ -1131,6 +1136,12 @@ class Output_data_glink : public Output_section_data return this->pltresolve_; } + protected: + // Write to a map file. + void + do_print_to_mapfile(Mapfile* mapfile) const + { mapfile->print_output_data(this, _("** glink")); } + private: static const int pltresolve_size = 16*4; @@ -1661,10 +1672,10 @@ Target_powerpc<size, big_endian>::Scan::get_reference_flags(unsigned int r_type) case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_LOCAL24PC: - case elfcpp::R_PPC_REL16: - case elfcpp::R_PPC_REL16_LO: - case elfcpp::R_PPC_REL16_HI: - case elfcpp::R_PPC_REL16_HA: + case elfcpp::R_POWERPC_REL16: + case elfcpp::R_POWERPC_REL16_LO: + case elfcpp::R_POWERPC_REL16_HI: + case elfcpp::R_POWERPC_REL16_HA: return Symbol::RELATIVE_REF; case elfcpp::R_PPC_PLTREL24: @@ -1823,6 +1834,7 @@ Target_powerpc<size, big_endian>::Scan::local( case elfcpp::R_POWERPC_NONE: case elfcpp::R_POWERPC_GNU_VTINHERIT: case elfcpp::R_POWERPC_GNU_VTENTRY: + case elfcpp::R_PPC64_TOCSAVE: break; case elfcpp::R_PPC64_ADDR64: @@ -1859,8 +1871,8 @@ Target_powerpc<size, big_endian>::Scan::local( case elfcpp::R_POWERPC_REL24: case elfcpp::R_PPC_LOCAL24PC: case elfcpp::R_POWERPC_REL32: - case elfcpp::R_PPC_REL16_LO: - case elfcpp::R_PPC_REL16_HA: + case elfcpp::R_POWERPC_REL16_LO: + case elfcpp::R_POWERPC_REL16_HA: break; case elfcpp::R_POWERPC_GOT16: @@ -2050,10 +2062,10 @@ Target_powerpc<size, big_endian>::Scan::global( } break; - case elfcpp::R_PPC_REL16: - case elfcpp::R_PPC_REL16_LO: - case elfcpp::R_PPC_REL16_HI: - case elfcpp::R_PPC_REL16_HA: + case elfcpp::R_POWERPC_REL16: + case elfcpp::R_POWERPC_REL16_LO: + case elfcpp::R_POWERPC_REL16_HI: + case elfcpp::R_POWERPC_REL16_HA: break; case elfcpp::R_POWERPC_GOT16: @@ -2400,15 +2412,15 @@ Target_powerpc<size, big_endian>::Relocate::relocate( Reloc::addr16_ha(view, value, 0); break; - case elfcpp::R_PPC_REL16_LO: + case elfcpp::R_POWERPC_REL16_LO: Reloc::rel16_lo(view, value, 0, address); break; - case elfcpp::R_PPC_REL16_HI: + case elfcpp::R_POWERPC_REL16_HI: Reloc::rel16_hi(view, value, 0, address); break; - case elfcpp::R_PPC_REL16_HA: + case elfcpp::R_POWERPC_REL16_HA: Reloc::rel16_ha(view, value, 0, address); break; @@ -2435,6 +2447,10 @@ Target_powerpc<size, big_endian>::Relocate::relocate( r_type); break; + case elfcpp::R_PPC64_TOCSAVE: + // For the time being this can be ignored. + break; + default: gold_error_at_location(relinfo, relnum, rela.get_r_offset(), _("unsupported reloc %u"), |