From: Cherry Mui Date: Wed, 21 Dec 2022 17:43:54 +0000 (-0500) Subject: [release-branch.go1.19] cmd/link: recognize the new R_LARCH_32_PCREL type on loong64 X-Git-Tag: go1.19.5~6 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=24963e5c06e8b90391f46f1bcf825c72342fa0eb;p=gostls13.git [release-branch.go1.19] cmd/link: recognize the new R_LARCH_32_PCREL type on loong64 This is a minimum backport of CL 420983 without an API change in debug/elf. Original CL description: Due to the latest binutils change [1], at least for certain 32-bit relocs in .eh_frame section, this new type of relocation record is emitted, leading to breakage on systems with bleeding-edge toolchain when trying to link with object(s) with such new-style relocs. Simply treating it the same as the existing reloc types seems enough. Updates #54222. Fixes #57444. [1]: https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=f09482a8747b6fd4c2d59a6a64677d3a3fe1e092 Change-Id: Idd86294a11c1d13b88acbca59e537656a57d8109 Reviewed-on: https://go-review.googlesource.com/c/go/+/458836 Reviewed-by: WANG Xuerui Auto-Submit: Dmitri Shuralyov Reviewed-by: David Chase TryBot-Result: Gopher Robot Run-TryBot: Cherry Mui --- diff --git a/src/cmd/link/internal/loadelf/ldelf.go b/src/cmd/link/internal/loadelf/ldelf.go index f5b7907675..d2d54efb30 100644 --- a/src/cmd/link/internal/loadelf/ldelf.go +++ b/src/cmd/link/internal/loadelf/ldelf.go @@ -1002,7 +1002,8 @@ func relSize(arch *sys.Arch, pn string, elftype uint32) (uint8, uint8, error) { LOONG64 | uint32(elf.R_LARCH_MARK_LA)<<16, LOONG64 | uint32(elf.R_LARCH_SOP_POP_32_S_0_10_10_16_S2)<<16, LOONG64 | uint32(elf.R_LARCH_64)<<16, - LOONG64 | uint32(elf.R_LARCH_MARK_PCREL)<<16: + LOONG64 | uint32(elf.R_LARCH_MARK_PCREL)<<16, + LOONG64 | 99<<16: // R_LARCH_32_PCREL return 4, 4, nil case S390X | uint32(elf.R_390_8)<<16: