From d4b87b1eb6439e1cd01d1a9f90dcf19428db4b17 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 14 Jun 2019 10:22:49 +0930 Subject: [PATCH] PowerPC comment fixes "paddi rt,sym@pcrel" as an abbreviation for "paddi rt,0,sym@pcrel,1" is invalid, so replace with "pla rt,sym@pcrel" which is a valid form of "pla rt,sym@pcrel(0),1". * elf64-ppc.c: Fix comments involving paddi. --- bfd/ChangeLog | 4 ++++ bfd/elf64-ppc.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b31e798bbb4..cb81fad413e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,7 @@ +2019-06-14 Alan Modra + + * elf64-ppc.c: Fix comments involving paddi. + 2019-06-12 Adam Lackorzymski PR 24643 diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c index f795e3f90b6..9372ea46943 100644 --- a/bfd/elf64-ppc.c +++ b/bfd/elf64-ppc.c @@ -2849,13 +2849,13 @@ must_be_dyn_reloc (struct bfd_link_info *info, There are also ELFv1 powerxx variants of these stubs. ppc_stub_long_branch_notoc: - . paddi %r12,dest@pcrel + . pla %r12,dest@pcrel . b dest ppc_stub_plt_branch_notoc: . lis %r11,(dest-1f)@highesta34 . ori %r11,%r11,(dest-1f)@highera34 . sldi %r11,%r11,34 - . 1: paddi %r12,dest@pcrel + . 1: pla %r12,dest@pcrel . add %r12,%r11,%r12 . mtctr %r12 . bctr @@ -2863,7 +2863,7 @@ must_be_dyn_reloc (struct bfd_link_info *info, . lis %r11,(xxx-1f)@highesta34 . ori %r11,%r11,(xxx-1f)@highera34 . sldi %r11,%r11,34 - . 1: paddi %r12,xxx@pcrel + . 1: pla %r12,xxx@pcrel . ldx %r12,%r11,%r12 . mtctr %r12 . bctr @@ -8191,7 +8191,7 @@ ok_lo_toc_insn (unsigned int insn, enum elf_ppc64_reloc_type r_type) pld ra,symbol@got@pcrel load/store rt,0(ra) or - paddi ra,symbol@pcrel + pla ra,symbol@pcrel load/store rt,0(ra) may be translated to pload/pstore rt,symbol@pcrel @@ -8200,7 +8200,7 @@ ok_lo_toc_insn (unsigned int insn, enum elf_ppc64_reloc_type r_type) the prefix insn in *PINSN1 and a NOP in *PINSN2. On entry to this function, the linker has already determined that - the pld can be replaced with paddi: *PINSN1 is that paddi insn, + the pld can be replaced with pla: *PINSN1 is that pla insn, while *PINSN2 is the second instruction. */ static bfd_boolean -- 2.30.2