aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@cs.berkeley.edu>2015-10-10 15:43:00 -0700
committerAndrew Waterman <waterman@cs.berkeley.edu>2015-10-10 15:43:58 -0700
commite05cc858aa5a6ed1ae0fec885a83090f81f355fe (patch)
tree50b93a74af26195701d468735903f7dae1ea20b9 /binutils
parent0c7ef246246f8abd971ccf7d1b33073ae5e9e67e (diff)
downloadriscv-gnu-toolchain-e05cc858aa5a6ed1ae0fec885a83090f81f355fe.zip
riscv-gnu-toolchain-e05cc858aa5a6ed1ae0fec885a83090f81f355fe.tar.gz
riscv-gnu-toolchain-e05cc858aa5a6ed1ae0fec885a83090f81f355fe.tar.bz2
binutils: relax LA macro to C.LUI when appropriate
Diffstat (limited to 'binutils')
-rw-r--r--binutils/gas/config/tc-riscv.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/binutils/gas/config/tc-riscv.c b/binutils/gas/config/tc-riscv.c
index 2d77871..d7e5bb6 100644
--- a/binutils/gas/config/tc-riscv.c
+++ b/binutils/gas/config/tc-riscv.c
@@ -937,12 +937,18 @@ macro (struct riscv_cl_insn *ip, expressionS *imm_expr,
if (imm_expr->X_op == O_constant)
load_const (rd, imm_expr);
- else if (riscv_opts.pic && mask == M_LA) /* Global PIC symbol */
+ else if (riscv_opts.pic && mask == M_LA) /* Global symbol in PIC */
pcrel_load (rd, rd, imm_expr, LOAD_ADDRESS_INSN,
BFD_RELOC_RISCV_GOT_HI20, BFD_RELOC_RISCV_PCREL_LO12_I);
- else /* Local PIC symbol, or any non-PIC symbol */
+ else if (riscv_opts.pic) /* Local symbol in PIC */
pcrel_load (rd, rd, imm_expr, "addi",
BFD_RELOC_RISCV_PCREL_HI20, BFD_RELOC_RISCV_PCREL_LO12_I);
+ else /* Any symbol in non-PIC */
+ {
+ macro_build (imm_expr, "lui", "d,u", rd, BFD_RELOC_RISCV_HI20);
+ macro_build (imm_expr, "addi", "d,s,j", rd, rd,
+ BFD_RELOC_RISCV_LO12_I);
+ }
break;
case M_LA_TLS_GD: