From 7fb7acb82d830dccb3a08c129535bd9bd8a29986 Mon Sep 17 00:00:00 2001 From: Joel Sing Date: Tue, 27 Feb 2024 23:57:43 +1100 Subject: [release-branch.go1.22] cmd/link/internal/riscv64: generate local text symbols for R_RISCV_CALL Correctly generate local text symbols needed for R_RISCV_CALL when external linking. R_RISCV_CALL was added in CL #520095 as a way of marking AUIPC+JALR pairs, instead of overloading R_RISCV_PCREL_ITYPE. However, genSymsLate was not updated to generate local text symbols for the new relocation type, leading to HI20 symbol lookup failures. This issue is detected by cmd/internal/obj/riscv.TestLargeCall, however this is unfortunately skipped in short mode. Fixes #66060 Change-Id: I8ee0f13791e0628f31657bf7dae2be8482b689b5 Reviewed-on: https://go-review.googlesource.com/c/go/+/567375 Reviewed-by: Mauri de Souza Meneguzzo Reviewed-by: Carlos Amedee Run-TryBot: Joel Sing Reviewed-by: Cherry Mui TryBot-Result: Gopher Robot LUCI-TryBot-Result: Go LUCI (cherry picked from commit b5a64ba62eafe5dee13562091ca03aef6cac87b6) Reviewed-on: https://go-review.googlesource.com/c/go/+/568157 Reviewed-by: Than McIntosh --- src/cmd/link/internal/riscv64/asm.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cmd/link/internal/riscv64/asm.go b/src/cmd/link/internal/riscv64/asm.go index d95de6cb36..6a4dd01240 100644 --- a/src/cmd/link/internal/riscv64/asm.go +++ b/src/cmd/link/internal/riscv64/asm.go @@ -170,8 +170,8 @@ func genSymsLate(ctxt *ld.Link, ldr *loader.Loader) { relocs := ldr.Relocs(s) for ri := 0; ri < relocs.Count(); ri++ { r := relocs.At(ri) - if r.Type() != objabi.R_RISCV_PCREL_ITYPE && r.Type() != objabi.R_RISCV_PCREL_STYPE && - r.Type() != objabi.R_RISCV_TLS_IE { + if r.Type() != objabi.R_RISCV_CALL && r.Type() != objabi.R_RISCV_PCREL_ITYPE && + r.Type() != objabi.R_RISCV_PCREL_STYPE && r.Type() != objabi.R_RISCV_TLS_IE { continue } if r.Off() == 0 && ldr.SymType(s) == sym.STEXT { -- cgit v1.2.3-54-g00ecf