RISC-V: Fixed more testcases for --with-arch and --with-abi

Same as cabae1c1c87d5f4ba28b7fdafe735b7c6207fb78

diff --git a/gas/testsuite/gas/riscv/attribute-11.s b/gas/testsuite/gas/riscv/attribute-11.s
index 81367da4d493391685555d933b698578600817d3..ef4e7ff68bd2c998d1b63ce419cece20c45e8723 100644 (file)
--- a/gas/testsuite/gas/riscv/attribute-11.s
+++ b/gas/testsuite/gas/riscv/attribute-11.s
@@ -1,3 +1,4 @@
        # The csr is explicit used, so we need to generate the priv spec
        # attributes even if the attributes are not set.
+       .option arch, +zicsr
        csrr a0, 0x0

diff --git a/gas/testsuite/gas/riscv/csr-fail-nonexistent.s b/gas/testsuite/gas/riscv/csr-fail-nonexistent.s
index 6e6d27e44a76b0042b72013dbabb7a017a1f6bb8..523cbd3cb773bd42a043ecb49b26d8d9b172f340 100644 (file)
--- a/gas/testsuite/gas/riscv/csr-fail-nonexistent.s
+++ b/gas/testsuite/gas/riscv/csr-fail-nonexistent.s
@@ -1 +1,2 @@
+       .option arch, +zicsr
        csrr a0, nonexistent

diff --git a/gas/testsuite/gas/riscv/fmv.x.s b/gas/testsuite/gas/riscv/fmv.x.s
index a16feda286833d85d962c80e90e116515165c132..83f982565b001519bfe8151af218865ac3af9297 100644 (file)
--- a/gas/testsuite/gas/riscv/fmv.x.s
+++ b/gas/testsuite/gas/riscv/fmv.x.s
@@ -1,3 +1,4 @@
+.option arch, +f
 fmv.x.w a2, fs7
 fmv.x.s a2, fs7
 fmv.w.x ft1, a6

diff --git a/gas/testsuite/gas/riscv/fsxxi.s b/gas/testsuite/gas/riscv/fsxxi.s
index e42d7863d95b14e2659f7e1bc1663c6868ccb9e4..67ba98b8e0ce6a1df72d8acbf6651a8bd575edda 100644 (file)
--- a/gas/testsuite/gas/riscv/fsxxi.s
+++ b/gas/testsuite/gas/riscv/fsxxi.s
@@ -1,3 +1,4 @@
+       .option arch, +f
        fsrmi x10, 0x1f
        fsrmi 0x1e
        fsflagsi x14, 0x1d

diff --git a/ld/testsuite/ld-riscv-elf/shared-lib-nopic-02.d b/ld/testsuite/ld-riscv-elf/shared-lib-nopic-02.d
index f866d01736281a5605b0295252cfb7622a67b928..67ac439217431b257f8d1f7ef40b17c0b608399b 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/shared-lib-nopic-02.d
+++ b/ld/testsuite/ld-riscv-elf/shared-lib-nopic-02.d
@@ -1,4 +1,4 @@
 #source: shared-lib-nopic-02.s
 #as:
 #ld: -shared
-#error: .*relocation R_RISCV_JAL against `foo_default' which may bind externally can not be used when making a shared object; recompile with -fPIC
+#error: .*relocation (R_RISCV_RVC_JUMP|R_RISCV_JAL) against `foo_default' which may bind externally can not be used when making a shared object; recompile with -fPIC