RISC-V: Also, fixed more ld testcases for --with-arch and --with-abi

Well these testcases cannot be fixed by .option norvc simply, that is because
current linker needs to check mapping symbols before doing any rvc relaxations,
https://github.com/riscv-non-isa/riscv-elf-psabi-doc/pull/393

Once we support the above features, we can revert this patch.

diff --git a/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d b/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
index d1344576ff34082145ef02a4a322700e4a648fe5..c60e48ab7fe5edeaa9fef97907d3a158802c5285 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
+++ b/ld/testsuite/ld-riscv-elf/pcgp-relax-01-norelaxgp.d
@@ -1,5 +1,6 @@
 #source: pcgp-relax-01.s
-#ld: --no-relax-gp --relax
+#as: -march=rv64i
+#ld: --no-relax-gp --relax -m[riscv_choose_lp64_emul]
 #objdump: -d -Mno-aliases
 
 .*:[   ]+file format .*

diff --git a/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d b/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
index f9425678559f7eacdfb222b9de198470d6894090..24f9c49044f737109f939d7b324ebade3cc81923 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
+++ b/ld/testsuite/ld-riscv-elf/pcgp-relax-01.d
@@ -1,5 +1,6 @@
 #source: pcgp-relax-01.s
-#ld: --relax
+#as: -march=rv64i
+#ld: --relax -m[riscv_choose_lp64_emul]
 #objdump: -d -Mno-aliases
 
 .*:[   ]+file format .*

diff --git a/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d b/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d
index 58328350ebc3248cb26add2bcc51ba0a7c36aaad..a4a94dbe9c5e30eb37d362441dfa70a294ff31ff 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d
+++ b/ld/testsuite/ld-riscv-elf/relax-max-align-gp.d
@@ -1,5 +1,6 @@
 #source: relax-max-align-gp.s
-#ld:
+#as: -march=rv64i
+#ld: -m[riscv_choose_lp64_emul]
 #objdump: -d
 
 .*:[   ]+file format .*

diff --git a/ld/testsuite/ld-riscv-elf/relro-relax-lui.d b/ld/testsuite/ld-riscv-elf/relro-relax-lui.d
index d29aa9d5f7a7613164f01814289e1e02d231526c..2b0670e002a6168cada493ad9012692e871b77ee 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/relro-relax-lui.d
+++ b/ld/testsuite/ld-riscv-elf/relro-relax-lui.d
@@ -1,5 +1,6 @@
 #source: relro-relax-lui.s
-#ld: -zrelro --relax
+#as: -march=rv64i
+#ld: -zrelro --relax -m[riscv_choose_lp64_emul]
 #objdump: -d -Mno-aliases
 
 .*:[   ]+file format .*

diff --git a/ld/testsuite/ld-riscv-elf/variant_cc-now.d b/ld/testsuite/ld-riscv-elf/variant_cc-now.d
index 9453554a159081fc51e3b8cf9baeede4d9b91214..b46b03c3ecd84d7070ada28d741ba6242497146b 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/variant_cc-now.d
+++ b/ld/testsuite/ld-riscv-elf/variant_cc-now.d
@@ -1,6 +1,7 @@
 #source: variant_cc-1.s
 #source: variant_cc-2.s
-#ld: -shared --hash-style=sysv -Ttext 0x8000 -z now
+#as: -march=rv64i -mabi=lp64
+#ld: -shared --hash-style=sysv -Ttext 0x8000 -z now -m[riscv_choose_lp64_emul]
 #readelf: -rsW
 
 Relocation section '.rela.plt' at .*

diff --git a/ld/testsuite/ld-riscv-elf/variant_cc-shared.d b/ld/testsuite/ld-riscv-elf/variant_cc-shared.d
index ffb69a392f27b632c3a58059017b2f13ddde2217..df7a13455b3e9b58d28d18e0608e7d7ec27329ee 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/variant_cc-shared.d
+++ b/ld/testsuite/ld-riscv-elf/variant_cc-shared.d
@@ -1,6 +1,7 @@
 #source: variant_cc-1.s
 #source: variant_cc-2.s
-#ld: -shared --hash-style=sysv -Ttext 0x8000
+#as: -march=rv64i -mabi=lp64
+#ld: -shared --hash-style=sysv -Ttext 0x8000 -m[riscv_choose_lp64_emul]
 #readelf: -rsW
 
 Relocation section '.rela.plt' at .*