Skip to content

Commit 1edefea

Browse files
author
Nelson Chu
committed
RISC-V: Fixed mapping symbol for .option norvc directive
1 parent 9be7e79 commit 1edefea

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

gas/config/tc-riscv.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5076,7 +5076,8 @@ s_riscv_option (int x ATTRIBUTE_UNUSED)
50765076
}
50775077
else if (strcmp (name, "norvc") == 0)
50785078
{
5079-
riscv_update_subset (&riscv_rps_as, "-c");
5079+
riscv_update_subset (&riscv_rps_as, "-c,-zca,-zcd,-zcf,-zcb,-zce,-zcmp,"
5080+
"-zcmt,-zcmop,-zclsd");
50805081
riscv_arch_str (xlen, riscv_rps_as.subset_list, true/* update */);
50815082
riscv_set_rvc (false);
50825083
}

gas/testsuite/gas/riscv/option-norvc.d

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ SYMBOL TABLE:
1515
0+0c l .text 0+00 \$xrv64i2p0_f2p0_d2p0_c2p0
1616
0+0e l .text 0+00 \$xrv64i2p0_f2p0_d2p0
1717
0+12 l .text 0+00 \$xrv64i2p0_f2p0_d2p0_zca1p0
18+
0+14 l .text 0+00 \$xrv64i2p0_f2p0_d2p0
1819
0+18 l .text 0+00 \$xrv32i2p0_f2p0_zca1p0_zcf1p0
20+
0+1a l .text 0+00 \$xrv32i2p0_f2p0
1921
0+1e l .text 0+00 \$xrv64i2p0_f2p0_d2p0_zca1p0_zcd1p0
22+
0+20 l .text 0+00 \$xrv64i2p0_f2p0_d2p0
2023
0+24 l .text 0+00 \$xrv32i2p0_zilsd1p0_zca1p0_zcb1p0_zclsd1p0
21-
0+30 l .text 0+00 \$xrv64i2p0_zca1p0_zcmop1p0_zcmp1p0_zcmt1p0
24+
0+28 l .text 0+00 \$xrv32i2p0_zilsd1p0
25+
0+30 l .text 0+00 \$xrv64i2p0
2226
0+0 l d .riscv.attributes 0+00 .riscv.attributes
2327

2428

0 commit comments

Comments
 (0)