From 2aece2ba02457e83fd2a780a8ac596b6a90adf29 Mon Sep 17 00:00:00 2001 From: Kuan-Lin Chen Date: Fri, 10 Feb 2017 14:58:52 +0800 Subject: [PATCH] RISC-V: Fix DW_CFA_advance_loc relocation. gas/ChangeLog: 2017-03-02 Kuan-Lin Chen * config/tc-riscv.c (md_apply_fix): Set fx_frag and fx_next->fx_frag for CFA_advance_loc relocations. --- gas/ChangeLog | 5 +++++ gas/config/tc-riscv.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/gas/ChangeLog b/gas/ChangeLog index 4d638b4d10d..1478cdfd233 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2017-03-02 Kuan-Lin Chen + + * config/tc-riscv.c (md_apply_fix): Set fx_frag and + fx_next->fx_frag for CFA_advance_loc relocations. + 2017-03-02 Kuan-Lin Chen * config/tc-riscv.c (md_apply_fix): Compute the correct offsets diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c index 3744e84d99a..723ccbafb0f 100644 --- a/gas/config/tc-riscv.c +++ b/gas/config/tc-riscv.c @@ -1966,6 +1966,8 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED) if (subtype < 0x80 && (subtype & 0x40)) { /* DW_CFA_advance_loc */ + fixP->fx_frag = (fragS *) fixP->fx_frag->fr_opcode; + fixP->fx_next->fx_frag = fixP->fx_frag; fixP->fx_r_type = BFD_RELOC_RISCV_SET6; fixP->fx_next->fx_r_type = BFD_RELOC_RISCV_SUB6; } -- 2.30.2