diff options
| author | Alexandre Oliva <aoliva@redhat.com> | 2006-03-17 06:44:37 +0000 |
|---|---|---|
| committer | Alexandre Oliva <aoliva@redhat.com> | 2006-03-17 06:44:37 +0000 |
| commit | e1710606c993baab0555429f130bbfd7a2fe3971 (patch) | |
| tree | f3d338ef713b441c42b2d34ed092d765fbb0c4f1 | |
| parent | 2de922512d6dede50c27e4af497e4b6fa5abb310 (diff) | |
| download | binutils-gdb-e1710606c993baab0555429f130bbfd7a2fe3971.tar.gz | |
bfd/ChangeLog:
* elf32-ppc.c (ppc_elf_relocate_section): Copy addend from
first relocation to the second when relaxing TLS GD to LE;
zero it out when relaxing to IE.
ld/testsuite/ChangeLog:
* ld-powerpc/tls32.s: Verify that +32768 @plt addend is
discarded.
| -rw-r--r-- | bfd/ChangeLog | 6 | ||||
| -rw-r--r-- | bfd/elf32-ppc.c | 3 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-powerpc/tls32.s | 4 |
4 files changed, 15 insertions, 3 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5b8d9086210..794f18f1226 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2006-03-17 Alexandre Oliva <aoliva@redhat.com> + + * elf32-ppc.c (ppc_elf_relocate_section): Copy addend from + first relocation to the second when relaxing TLS GD to LE; + zero it out when relaxing to IE. + 2006-03-17 Alan Modra <amodra@bigpond.net.au> PR 2434 diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c index 2fd30a0560b..6a2d5170d78 100644 --- a/bfd/elf32-ppc.c +++ b/bfd/elf32-ppc.c @@ -5768,6 +5768,7 @@ ppc_elf_relocate_section (bfd *output_bfd, insn1 |= 32 << 26; /* lwz */ insn2 = 0x7c631214; /* add 3,3,2 */ rel[1].r_info = ELF32_R_INFO (r_symndx2, R_PPC_NONE); + rel[1].r_addend = 0; r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3) + R_PPC_GOT_TPREL16); rel->r_info = ELF32_R_INFO (r_symndx, r_type); @@ -5782,13 +5783,13 @@ ppc_elf_relocate_section (bfd *output_bfd, /* Was an LD reloc. */ r_symndx = 0; rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET; - rel[1].r_addend = htab->elf.tls_sec->vma + DTP_OFFSET; } r_type = R_PPC_TPREL16_HA; rel->r_info = ELF32_R_INFO (r_symndx, r_type); rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO); rel[1].r_offset += 2; + rel[1].r_addend = rel->r_addend; } bfd_put_32 (output_bfd, insn1, contents + rel->r_offset - 2); bfd_put_32 (output_bfd, insn2, contents + offset); diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index a9f13571d6b..f968b4ce178 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-03-17 Alexandre Oliva <aoliva@redhat.com> + + * ld-powerpc/tls32.s: Verify that +32768 @plt addend is + discarded. + 2006-03-14 Richard Sandiford <richard@codesourcery.com> * ld-mips/emit-relocs-1a.s, ld-mips/emit-relocs-1b.s, diff --git a/ld/testsuite/ld-powerpc/tls32.s b/ld/testsuite/ld-powerpc/tls32.s index b8d0e3d11cf..1c3092d5d2e 100644 --- a/ld/testsuite/ld-powerpc/tls32.s +++ b/ld/testsuite/ld-powerpc/tls32.s @@ -33,11 +33,11 @@ _start: #global syms #GD addi 3,31,gd0@got@tlsgd #R_PPC_GOT_TLSGD16 gd0 - bl __tls_get_addr@plt #R_PPC_PLTREL24 __tls_get_addr + bl __tls_get_addr+0x8000@plt #R_PPC_PLTREL24 __tls_get_addr #LD addi 3,31,ld0@got@tlsld #R_PPC_GOT_TLSLD16 ld0 - bl __tls_get_addr@plt #R_PPC_PLTREL24 __tls_get_addr + bl __tls_get_addr+0x8000@plt #R_PPC_PLTREL24 __tls_get_addr addi 9,3,ld0@dtprel #R_PPC_DTPREL16 ld0 |