RISC-V: Fixed mapping symbol for .option norvc directive

diff --git a/gas/config/tc-riscv.c b/gas/config/tc-riscv.c
index 60e4f5bf813a25f672bd7213db7b73cc10059ffc..cb21620b5ff41475cdf927984fc36582dc01914f 100644 (file)
--- a/gas/config/tc-riscv.c
+++ b/gas/config/tc-riscv.c
@@ -5076,7 +5076,8 @@ s_riscv_option (int x ATTRIBUTE_UNUSED)
     }
   else if (strcmp (name, "norvc") == 0)
     {
-      riscv_update_subset (&riscv_rps_as, "-c");
+      riscv_update_subset (&riscv_rps_as, "-c,-zca,-zcd,-zcf,-zcb,-zce,-zcmp,"
+                                         "-zcmt,-zcmop,-zclsd");
       riscv_arch_str (xlen, riscv_rps_as.subset_list, true/* update */);
       riscv_set_rvc (false);
     }

diff --git a/gas/testsuite/gas/riscv/option-norvc.d b/gas/testsuite/gas/riscv/option-norvc.d
index c2647d382b3c93ea4bf671c6445af679570d0a98..6f36ed6c0854971e2b75e23473886368e1182087 100644 (file)
--- a/gas/testsuite/gas/riscv/option-norvc.d
+++ b/gas/testsuite/gas/riscv/option-norvc.d
@@ -15,10 +15,14 @@ SYMBOL TABLE:
 0+0c l       .text     0+00 \$xrv64i2p0_f2p0_d2p0_c2p0
 0+0e l       .text     0+00 \$xrv64i2p0_f2p0_d2p0
 0+12 l       .text     0+00 \$xrv64i2p0_f2p0_d2p0_zca1p0
+0+14 l       .text     0+00 \$xrv64i2p0_f2p0_d2p0
 0+18 l       .text     0+00 \$xrv32i2p0_f2p0_zca1p0_zcf1p0
+0+1a l       .text     0+00 \$xrv32i2p0_f2p0
 0+1e l       .text     0+00 \$xrv64i2p0_f2p0_d2p0_zca1p0_zcd1p0
+0+20 l       .text     0+00 \$xrv64i2p0_f2p0_d2p0
 0+24 l       .text     0+00 \$xrv32i2p0_zilsd1p0_zca1p0_zcb1p0_zclsd1p0
-0+30 l       .text     0+00 \$xrv64i2p0_zca1p0_zcmop1p0_zcmp1p0_zcmt1p0
+0+28 l       .text     0+00 \$xrv32i2p0_zilsd1p0
+0+30 l       .text     0+00 \$xrv64i2p0
 0+0 l    d  .riscv.attributes  0+00 .riscv.attributes