PowerPC64 ELFv2 entry code

This tightens the condition under which ld optimizes PIC entry code
to non-PIC.

bfd/
	* elf64-ppc.c (ppc64_elf_relocate_section): Further restrict
	ELFv2 entry optimization.
gold/
	* powerpc.cc (relocate): Further restrict ELFv2 entry optimization.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 898af5684a42c376cc15f9fd24fde2a8c33bd2e2..81e751c4ea009459f926d4143cde5e5f9bf63064 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2016-02-02  Alan Modra  <[email protected]>
+
+       * elf64-ppc.c (ppc64_elf_relocate_section): Further restrict
+       ELFv2 entry optimization.
+
 2016-02-02  H.J. Lu  <[email protected]>
 
        PR binutils/19547

diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index f9c37b5b3decfa2b1c4d201b9f0b0fcdc23f430c..369eae52f146b621798d9ed102e688f93b55e3f6 100644 (file)
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -13915,6 +13915,7 @@ ppc64_elf_relocate_section (bfd *output_bfd,
          if (!bfd_link_pic (info)
              && !info->traditional_format
              && !htab->opd_abi
+             && rel->r_addend == 0
              && h != NULL && &h->elf == htab->elf.hgot
              && rel + 1 < relend
              && rel[1].r_info == ELF64_R_INFO (r_symndx, R_PPC64_REL16_LO)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 06cafb05a5a2d1218527cf45ebc8f95cc2338aab..c0b7e5607a22931dd380e0cbcae48e7d3d1b79d3 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-02  Alan Modra  <[email protected]>
+
+       * powerpc.cc (relocate): Further restrict ELFv2 entry optimization.
+
 2016-01-15 Han Shen  <[email protected]>
 
        PR gold/19472 - need pc-relative stubs.

diff --git a/gold/powerpc.cc b/gold/powerpc.cc
index e26a198671128cd54d66eee446aa0bc4d239805f..6df2904b708e07bd826e1b05d020a5cbd4ec35c2 100644 (file)
--- a/gold/powerpc.cc
+++ b/gold/powerpc.cc
@@ -7727,6 +7727,7 @@ Target_powerpc<size, big_endian>::Relocate::relocate(
              && preloc != NULL
              && target->abiversion() >= 2
              && !parameters->options().output_is_position_independent()
+             && rela.get_r_addend() == 4
              && gsym != NULL
              && strcmp(gsym->name(), ".TOC.") == 0)
            {