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

[Nelson Chu]

Same as cabae1c1c87d5f4ba28b7fdafe735b7c6207fb78
---
 gas/testsuite/gas/riscv/attribute-11.s          | 1 +
 gas/testsuite/gas/riscv/csr-fail-nonexistent.s  | 1 +
 gas/testsuite/gas/riscv/fmv.x.s                 | 1 +
 gas/testsuite/gas/riscv/fsxxi.s                 | 1 +
 ld/testsuite/ld-riscv-elf/shared-lib-nopic-02.d | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gas/testsuite/gas/riscv/attribute-11.s b/gas/testsuite/gas/riscv/attribute-11.s
index 81367da4d49..ef4e7ff68bd 100644
--- 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 6e6d27e44a7..523cbd3cb77 100644
--- 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 a16feda2868..83f982565b0 100644
--- 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 e42d7863d95..67ba98b8e0c 100644
--- 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 f866d017362..67ac4392174 100644
--- 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
-- 
2.39.5 (Apple Git-154)