From 6fe8981620aa61cb43476538f8230231623f9e13 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Mon, 15 Feb 2021 13:58:45 -0500 Subject: [PATCH] cmd/internal/obj/riscv: fix JMP name<>(SB) It was being rejected. Now it isn't and can be used in the runtime. Change-Id: I4626bf9fc2e0bc26fffb87d11bede459964324b3 Reviewed-on: https://go-review.googlesource.com/c/go/+/292129 Trust: Russ Cox Reviewed-by: Cherry Zhang --- src/cmd/internal/obj/riscv/obj.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/internal/obj/riscv/obj.go b/src/cmd/internal/obj/riscv/obj.go index 9257a6453a..5ef334dd6a 100644 --- a/src/cmd/internal/obj/riscv/obj.go +++ b/src/cmd/internal/obj/riscv/obj.go @@ -119,7 +119,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog, newprog obj.ProgAlloc) { switch p.To.Name { case obj.NAME_NONE: p.As = AJALR - case obj.NAME_EXTERN: + case obj.NAME_EXTERN, obj.NAME_STATIC: // Handled in preprocess. default: ctxt.Diag("unsupported name %d for %v", p.To.Name, p) @@ -267,7 +267,7 @@ func rewriteMOV(ctxt *obj.Link, newprog obj.ProgAlloc, p *obj.Prog) { p.As = movToStore(p.As) p.To.Reg = addrToReg(p.To) - case obj.NAME_EXTERN: + case obj.NAME_EXTERN, obj.NAME_STATIC: // AUIPC $off_hi, TMP // S $off_lo, TMP, R as := p.As @@ -666,7 +666,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym, newprog obj.ProgAlloc) { switch p.To.Type { case obj.TYPE_MEM: switch p.To.Name { - case obj.NAME_EXTERN: + case obj.NAME_EXTERN, obj.NAME_STATIC: // JMP to symbol. jalrToSym(ctxt, p, newprog, REG_ZERO) } -- 2.50.0