aboutsummaryrefslogtreecommitdiff
path: root/ld
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2005-03-08 02:31:40 +0000
committerHans-Peter Nilsson <hp@axis.com>2005-03-08 02:31:40 +0000
commit9a6351f1d23c0b4c67f9600f678afdf942d7af96 (patch)
tree11e13f5ffc87fa9e3bdc29aa8131b9aa1079e228 /ld
parent66798ad6ae1fbd9f97c46a1eb477e05e9d60b24b (diff)
downloadgdb-9a6351f1d23c0b4c67f9600f678afdf942d7af96.zip
gdb-9a6351f1d23c0b4c67f9600f678afdf942d7af96.tar.gz
gdb-9a6351f1d23c0b4c67f9600f678afdf942d7af96.tar.bz2
Adjust testsuite for cris-axis-aout.
* ld-cris/noglob1.d: Adjust regexp for a.out output. * ld-cris/badgotr1.d, ld-cris/expdyn1.d, ld-cris/expdyn2.d, ld-cris/expdyn3.d, ld-cris/expdyn4.d, ld-cris/expdyn5.d, ld-cris/expdyn6.d, ld-cris/expdyn7.d, ld-cris/gotplt1.d, ld-cris/gotplt2.d, ld-cris/gotplt3.d, ld-cris/hiddef1.d, ld-cris/libdso-1.d, ld-cris/libdso-10.d, ld-cris/libdso-11.d, ld-cris/libdso-12.d, ld-cris/libdso-13.d, ld-cris/libdso-14.d, ld-cris/libdso-2.d, ld-cris/libdso-3.d, ld-cris/libdso-4.d, ld-cris/locref1.d, ld-cris/locref2.d, ld-cris/nodyn4.d, ld-cris/nodyn5.d, ld-cris/pv32-1.d, ld-cris/undef1.d, ld-cris/weakref1.d: ld-cris/weakref2.d: Pass --em=criself to gas. * ld-cris/v10-v32.d, ld-cris/v10-va.d, ld-cris/v32-ba-1.d, ld-cris/v32-v10.d, ld-cris/v32-va.d, ld-cris/va-v10.d, ld-cris/va-v32.d: Ditto. Pass -m criself to gld. * ld-cris/v32-bin-1.d: Pass -m criself to gld.
Diffstat (limited to 'ld')
-rw-r--r--ld/testsuite/ChangeLog19
-rw-r--r--ld/testsuite/ld-cris/badgotr1.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn1.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn2.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn3.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn4.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn5.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn6.d2
-rw-r--r--ld/testsuite/ld-cris/expdyn7.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt1.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt2.d2
-rw-r--r--ld/testsuite/ld-cris/gotplt3.d2
-rw-r--r--ld/testsuite/ld-cris/hiddef1.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-1.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-10.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-11.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-12.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-13.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-14.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-2.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-3.d2
-rw-r--r--ld/testsuite/ld-cris/libdso-4.d2
-rw-r--r--ld/testsuite/ld-cris/locref1.d2
-rw-r--r--ld/testsuite/ld-cris/locref2.d2
-rw-r--r--ld/testsuite/ld-cris/nodyn4.d2
-rw-r--r--ld/testsuite/ld-cris/nodyn5.d2
-rw-r--r--ld/testsuite/ld-cris/noglob1.d2
-rw-r--r--ld/testsuite/ld-cris/pv32-1.d2
-rw-r--r--ld/testsuite/ld-cris/undef1.d2
-rw-r--r--ld/testsuite/ld-cris/v10-v32.d3
-rw-r--r--ld/testsuite/ld-cris/v10-va.d3
-rw-r--r--ld/testsuite/ld-cris/v32-ba-1.d4
-rw-r--r--ld/testsuite/ld-cris/v32-bin-1.d2
-rw-r--r--ld/testsuite/ld-cris/v32-v10.d3
-rw-r--r--ld/testsuite/ld-cris/v32-va.d3
-rw-r--r--ld/testsuite/ld-cris/va-v10.d3
-rw-r--r--ld/testsuite/ld-cris/va-v32.d3
-rw-r--r--ld/testsuite/ld-cris/weakref1.d2
-rw-r--r--ld/testsuite/ld-cris/weakref2.d2
39 files changed, 64 insertions, 39 deletions
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b65c401..a089dd2 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2005-03-08 Hans-Peter Nilsson <hp@axis.com>
+
+ Adjust testsuite for cris-axis-aout.
+ * ld-cris/noglob1.d: Adjust regexp for a.out output.
+ * ld-cris/badgotr1.d, ld-cris/expdyn1.d, ld-cris/expdyn2.d,
+ ld-cris/expdyn3.d, ld-cris/expdyn4.d, ld-cris/expdyn5.d,
+ ld-cris/expdyn6.d, ld-cris/expdyn7.d, ld-cris/gotplt1.d,
+ ld-cris/gotplt2.d, ld-cris/gotplt3.d, ld-cris/hiddef1.d,
+ ld-cris/libdso-1.d, ld-cris/libdso-10.d, ld-cris/libdso-11.d,
+ ld-cris/libdso-12.d, ld-cris/libdso-13.d, ld-cris/libdso-14.d,
+ ld-cris/libdso-2.d, ld-cris/libdso-3.d, ld-cris/libdso-4.d,
+ ld-cris/locref1.d, ld-cris/locref2.d, ld-cris/nodyn4.d,
+ ld-cris/nodyn5.d, ld-cris/pv32-1.d, ld-cris/undef1.d,
+ ld-cris/weakref1.d: ld-cris/weakref2.d: Pass --em=criself to gas.
+ * ld-cris/v10-v32.d, ld-cris/v10-va.d, ld-cris/v32-ba-1.d,
+ ld-cris/v32-v10.d, ld-cris/v32-va.d, ld-cris/va-v10.d,
+ ld-cris/va-v32.d: Ditto. Pass -m criself to gld.
+ * ld-cris/v32-bin-1.d: Pass -m criself to gld.
+
2005-03-05 Alan Modra <amodra@bigpond.net.au>
* ld-alpha/tlsbin.dd: Update to suit changed section layout and
diff --git a/ld/testsuite/ld-cris/badgotr1.d b/ld/testsuite/ld-cris/badgotr1.d
index f8306f8..7ef7036 100644
--- a/ld/testsuite/ld-cris/badgotr1.d
+++ b/ld/testsuite/ld-cris/badgotr1.d
@@ -1,5 +1,5 @@
#source: gotrel1.s
-#as: --pic --underscore
+#as: --pic --underscore --em=criself
#ld: -m crislinux -shared
#objdump: -dr
#error: ^[^c][^h][^i][^l][^d].* uses _-prefixed .* failed to merge .* no GOT .* Bad value$
diff --git a/ld/testsuite/ld-cris/expdyn1.d b/ld/testsuite/ld-cris/expdyn1.d
index 9097c4f..a1fae23 100644
--- a/ld/testsuite/ld-cris/expdyn1.d
+++ b/ld/testsuite/ld-cris/expdyn1.d
@@ -1,5 +1,5 @@
#source: expdyn1.s
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux -export-dynamic tmpdir/libdso-1.so
#objdump: -T
diff --git a/ld/testsuite/ld-cris/expdyn2.d b/ld/testsuite/ld-cris/expdyn2.d
index 714396e..6c5faa5 100644
--- a/ld/testsuite/ld-cris/expdyn2.d
+++ b/ld/testsuite/ld-cris/expdyn2.d
@@ -1,6 +1,6 @@
#source: expdyn1.s
#source: expdref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -R
diff --git a/ld/testsuite/ld-cris/expdyn3.d b/ld/testsuite/ld-cris/expdyn3.d
index f16f819..34f2a5e 100644
--- a/ld/testsuite/ld-cris/expdyn3.d
+++ b/ld/testsuite/ld-cris/expdyn3.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: euwref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -R
diff --git a/ld/testsuite/ld-cris/expdyn4.d b/ld/testsuite/ld-cris/expdyn4.d
index 31ce664..e932056 100644
--- a/ld/testsuite/ld-cris/expdyn4.d
+++ b/ld/testsuite/ld-cris/expdyn4.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: comref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -R
diff --git a/ld/testsuite/ld-cris/expdyn5.d b/ld/testsuite/ld-cris/expdyn5.d
index f529cfe..280f651 100644
--- a/ld/testsuite/ld-cris/expdyn5.d
+++ b/ld/testsuite/ld-cris/expdyn5.d
@@ -1,6 +1,6 @@
#source: expdyn1.s
#source: expdref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -s -j .got
diff --git a/ld/testsuite/ld-cris/expdyn6.d b/ld/testsuite/ld-cris/expdyn6.d
index 297b77b..42b4712 100644
--- a/ld/testsuite/ld-cris/expdyn6.d
+++ b/ld/testsuite/ld-cris/expdyn6.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: euwref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -s -j .got
diff --git a/ld/testsuite/ld-cris/expdyn7.d b/ld/testsuite/ld-cris/expdyn7.d
index cecba85..be7a35a 100644
--- a/ld/testsuite/ld-cris/expdyn7.d
+++ b/ld/testsuite/ld-cris/expdyn7.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: comref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux --export-dynamic tmpdir/libdso-1.so
#objdump: -s -j .got
diff --git a/ld/testsuite/ld-cris/gotplt1.d b/ld/testsuite/ld-cris/gotplt1.d
index 222f18b..e82370a 100644
--- a/ld/testsuite/ld-cris/gotplt1.d
+++ b/ld/testsuite/ld-cris/gotplt1.d
@@ -1,7 +1,7 @@
#source: dso-2.s
#source: dsofnf2.s
#source: gotrel1.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: -m crislinux tmpdir/libdso-1.so
#objdump: -sR
diff --git a/ld/testsuite/ld-cris/gotplt2.d b/ld/testsuite/ld-cris/gotplt2.d
index feddf71..d60dd96 100644
--- a/ld/testsuite/ld-cris/gotplt2.d
+++ b/ld/testsuite/ld-cris/gotplt2.d
@@ -1,7 +1,7 @@
#source: dso-2.s
#source: dsofnf.s
#source: gotrel1.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: -shared -m crislinux -z nocombreloc
#objdump: -sR
diff --git a/ld/testsuite/ld-cris/gotplt3.d b/ld/testsuite/ld-cris/gotplt3.d
index 07d217a..e03c473 100644
--- a/ld/testsuite/ld-cris/gotplt3.d
+++ b/ld/testsuite/ld-cris/gotplt3.d
@@ -2,7 +2,7 @@
#source: dsofnf.s
#source: gotrel1.s
#source: dso-1.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: -shared -m crislinux -z nocombreloc
#objdump: -sR
diff --git a/ld/testsuite/ld-cris/hiddef1.d b/ld/testsuite/ld-cris/hiddef1.d
index e491be9..cee53f5 100644
--- a/ld/testsuite/ld-cris/hiddef1.d
+++ b/ld/testsuite/ld-cris/hiddef1.d
@@ -2,7 +2,7 @@
#source: hiddef1.s
#source: hidrefgotplt1.s
#ld: -shared -m crislinux
-#as: --pic --no-underscore -I$srcdir/$subdir
+#as: --pic --no-underscore -I$srcdir/$subdir --em=criself
#readelf: -S -s -r
# Regression test for mishandling of GOTPLT relocs against a
diff --git a/ld/testsuite/ld-cris/libdso-1.d b/ld/testsuite/ld-cris/libdso-1.d
index 91fc98a..dec0ccd 100644
--- a/ld/testsuite/ld-cris/libdso-1.d
+++ b/ld/testsuite/ld-cris/libdso-1.d
@@ -1,5 +1,5 @@
#source: dso-1.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: --shared -m crislinux
#objdump: -T
diff --git a/ld/testsuite/ld-cris/libdso-10.d b/ld/testsuite/ld-cris/libdso-10.d
index 7b7171a..d3a4a23 100644
--- a/ld/testsuite/ld-cris/libdso-10.d
+++ b/ld/testsuite/ld-cris/libdso-10.d
@@ -1,5 +1,5 @@
#source: dso-1.s
-#as: --pic --no-underscore --march=v32
+#as: --pic --no-underscore --march=v32 --em=criself
#ld: --shared -m crislinux
#objdump: -p -h
diff --git a/ld/testsuite/ld-cris/libdso-11.d b/ld/testsuite/ld-cris/libdso-11.d
index 440bec3..6646e42 100644
--- a/ld/testsuite/ld-cris/libdso-11.d
+++ b/ld/testsuite/ld-cris/libdso-11.d
@@ -1,6 +1,6 @@
#source: dso-1.s
#source: dsov32-1.s
-#as: --pic --no-underscore --march=v32
+#as: --pic --no-underscore --march=v32 --em=criself
#ld: --shared -m crislinux
#objdump: -s -T
diff --git a/ld/testsuite/ld-cris/libdso-12.d b/ld/testsuite/ld-cris/libdso-12.d
index f339ac2..dc8451e 100644
--- a/ld/testsuite/ld-cris/libdso-12.d
+++ b/ld/testsuite/ld-cris/libdso-12.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: dsov32-1.s
#source: dsov32-2.s
-#as: --pic --no-underscore --march=v32
+#as: --pic --no-underscore --march=v32 --em=criself
#ld: --shared -m crislinux -z nocombreloc
#objdump: -s -T
diff --git a/ld/testsuite/ld-cris/libdso-13.d b/ld/testsuite/ld-cris/libdso-13.d
index b58f670..a416557 100644
--- a/ld/testsuite/ld-cris/libdso-13.d
+++ b/ld/testsuite/ld-cris/libdso-13.d
@@ -1,6 +1,6 @@
#source: dso-1.s
#source: dsov32-3.s
-#as: --pic --no-underscore --march=v32
+#as: --pic --no-underscore --march=v32 --em=criself
#ld: --shared -m crislinux -z nocombreloc
#readelf: -d -r
#warning: relocation R_CRIS_32_PCREL should not be used in a shared object; recompile with -fPIC
diff --git a/ld/testsuite/ld-cris/libdso-14.d b/ld/testsuite/ld-cris/libdso-14.d
index 2258927..ac84c43 100644
--- a/ld/testsuite/ld-cris/libdso-14.d
+++ b/ld/testsuite/ld-cris/libdso-14.d
@@ -1,6 +1,6 @@
#source: dso-1.s
#source: dsov32-4.s
-#as: --pic --no-underscore --march=v32
+#as: --pic --no-underscore --march=v32 --em=criself
#ld: --shared -m crislinux
#readelf: -d -r
diff --git a/ld/testsuite/ld-cris/libdso-2.d b/ld/testsuite/ld-cris/libdso-2.d
index c5d2a1b..a3cc757 100644
--- a/ld/testsuite/ld-cris/libdso-2.d
+++ b/ld/testsuite/ld-cris/libdso-2.d
@@ -1,6 +1,6 @@
#source: dso-1.s
#source: dso-2.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: --shared -m crislinux --version-script $srcdir/$subdir/hide1
#readelf: -S -s -r
diff --git a/ld/testsuite/ld-cris/libdso-3.d b/ld/testsuite/ld-cris/libdso-3.d
index 9111797..9e18c59 100644
--- a/ld/testsuite/ld-cris/libdso-3.d
+++ b/ld/testsuite/ld-cris/libdso-3.d
@@ -1,6 +1,6 @@
#source: expdyn1.s
#source: dso-3.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: --shared -m crislinux
#objdump: -R
diff --git a/ld/testsuite/ld-cris/libdso-4.d b/ld/testsuite/ld-cris/libdso-4.d
index b94199c..b7cc840 100644
--- a/ld/testsuite/ld-cris/libdso-4.d
+++ b/ld/testsuite/ld-cris/libdso-4.d
@@ -1,5 +1,5 @@
#source: dso-2.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: --shared -m crislinux
#objdump: -T
diff --git a/ld/testsuite/ld-cris/locref1.d b/ld/testsuite/ld-cris/locref1.d
index c13a2e0..3487a30 100644
--- a/ld/testsuite/ld-cris/locref1.d
+++ b/ld/testsuite/ld-cris/locref1.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic
+#as: --no-underscore --pic --em=criself
#source: expdyn1.s
#source: locref1.s
#ld: -m crislinux
diff --git a/ld/testsuite/ld-cris/locref2.d b/ld/testsuite/ld-cris/locref2.d
index 784be29..829d22b 100644
--- a/ld/testsuite/ld-cris/locref2.d
+++ b/ld/testsuite/ld-cris/locref2.d
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic
+#as: --no-underscore --pic --em=criself
#source: gotrel1.s
#source: locref2.s
#ld: -m crislinux
diff --git a/ld/testsuite/ld-cris/nodyn4.d b/ld/testsuite/ld-cris/nodyn4.d
index 7d0b5f8..c1af092 100644
--- a/ld/testsuite/ld-cris/nodyn4.d
+++ b/ld/testsuite/ld-cris/nodyn4.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: comref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux
#readelf: -l
diff --git a/ld/testsuite/ld-cris/nodyn5.d b/ld/testsuite/ld-cris/nodyn5.d
index b090f36..ea8e154 100644
--- a/ld/testsuite/ld-cris/nodyn5.d
+++ b/ld/testsuite/ld-cris/nodyn5.d
@@ -1,7 +1,7 @@
#source: expdyn1.s
#source: expdref1.s --pic
#source: comref1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux
#objdump: -s -j .got
diff --git a/ld/testsuite/ld-cris/noglob1.d b/ld/testsuite/ld-cris/noglob1.d
index bcef018..49ca3b6 100644
--- a/ld/testsuite/ld-cris/noglob1.d
+++ b/ld/testsuite/ld-cris/noglob1.d
@@ -5,5 +5,5 @@
# Check that we can link an object that doesn't have any global symbols;
# where elf_sym_hashes(bfd) is NULL.
-.*: file format elf32.*-cris
+.*: file format .*-cris
#pass
diff --git a/ld/testsuite/ld-cris/pv32-1.d b/ld/testsuite/ld-cris/pv32-1.d
index 177fc13..8e2e2b1 100644
--- a/ld/testsuite/ld-cris/pv32-1.d
+++ b/ld/testsuite/ld-cris/pv32-1.d
@@ -1,5 +1,5 @@
#source: pv32.s
-#as: --march=v32 --no-underscore
+#as: --march=v32 --no-underscore --em=criself
#ld: -e here -m crislinux tmpdir/libdso-12.so
#objdump: -s -T
diff --git a/ld/testsuite/ld-cris/undef1.d b/ld/testsuite/ld-cris/undef1.d
index 9eeeb67..70d007e 100644
--- a/ld/testsuite/ld-cris/undef1.d
+++ b/ld/testsuite/ld-cris/undef1.d
@@ -1,6 +1,6 @@
#source: dso-1.s
#source: gotrel1.s --pic
-#as: --no-underscore
+#as: --no-underscore --em=criself
#ld: -m crislinux tmpdir/libdso-4.so
#objdump: -T
diff --git a/ld/testsuite/ld-cris/v10-v32.d b/ld/testsuite/ld-cris/v10-v32.d
index 259f60b..b66ee06 100644
--- a/ld/testsuite/ld-cris/v10-v32.d
+++ b/ld/testsuite/ld-cris/v10-v32.d
@@ -1,6 +1,7 @@
# source: start1.s --march=v32
# source: move-1.s --march=v0_v10
-# ld:
+# as: --em=criself
+# ld: -m criself
# error: contains non-CRIS-v32 code
# Test that linking a (classic) v10 object to a v32 object does
diff --git a/ld/testsuite/ld-cris/v10-va.d b/ld/testsuite/ld-cris/v10-va.d
index 6dd7ca8..8bff7cb 100644
--- a/ld/testsuite/ld-cris/v10-va.d
+++ b/ld/testsuite/ld-cris/v10-va.d
@@ -1,6 +1,7 @@
# source: start1.s --march=common_v10_v32
# source: move-1.s --march=v0_v10
-# ld:
+# as: --em=criself
+# ld: -m criself
# objdump: -p
# Test that linking a v10 compatible object to a v10+v32 object
diff --git a/ld/testsuite/ld-cris/v32-ba-1.d b/ld/testsuite/ld-cris/v32-ba-1.d
index 686b534..7f716e8 100644
--- a/ld/testsuite/ld-cris/v32-ba-1.d
+++ b/ld/testsuite/ld-cris/v32-ba-1.d
@@ -1,5 +1,5 @@
-# as: --march=v32
-# ld:
+# as: --march=v32 --em=criself
+# ld: -m criself
# objdump: -d
# Check that 32-bit branches (PCREL:s) are relocated right.
diff --git a/ld/testsuite/ld-cris/v32-bin-1.d b/ld/testsuite/ld-cris/v32-bin-1.d
index ef2d39a..02ce118 100644
--- a/ld/testsuite/ld-cris/v32-bin-1.d
+++ b/ld/testsuite/ld-cris/v32-bin-1.d
@@ -1,5 +1,5 @@
#as: --em=criself --march=v32
-#ld: --oformat binary --defsym ext1=0x4000 --defsym ext2=0x6000
+#ld: -m criself --oformat binary --defsym ext1=0x4000 --defsym ext2=0x6000
#objdump: -s -b binary
# Test that pcrel relocs work with --oformat binary.
diff --git a/ld/testsuite/ld-cris/v32-v10.d b/ld/testsuite/ld-cris/v32-v10.d
index 27b477d..e1dbe7d 100644
--- a/ld/testsuite/ld-cris/v32-v10.d
+++ b/ld/testsuite/ld-cris/v32-v10.d
@@ -1,6 +1,7 @@
# source: start1.s --march=v0_v10
# source: move-1.s --march=v32
-# ld:
+# as: --em=criself
+# ld: -m criself
# error: contains CRIS v32 code
# Test that linking a v32 object to a (classic) v10 object does
diff --git a/ld/testsuite/ld-cris/v32-va.d b/ld/testsuite/ld-cris/v32-va.d
index 4c516f6..49126d5 100644
--- a/ld/testsuite/ld-cris/v32-va.d
+++ b/ld/testsuite/ld-cris/v32-va.d
@@ -1,6 +1,7 @@
# source: start1.s --march=common_v10_v32
# source: move-1.s --march=v32
-# ld:
+# as: --em=criself
+# ld: -m criself
# objdump: -p
# Test that linking a v32 object to a v10+v32 object
diff --git a/ld/testsuite/ld-cris/va-v10.d b/ld/testsuite/ld-cris/va-v10.d
index 8612b58..ec09d6c 100644
--- a/ld/testsuite/ld-cris/va-v10.d
+++ b/ld/testsuite/ld-cris/va-v10.d
@@ -1,6 +1,7 @@
# source: start1.s --march=v0_v10
# source: move-1.s --march=common_v10_v32
-# ld:
+# as: --em=criself
+# ld: -m criself
# objdump: -p
# Test that linking a v10+v32 compatible object to a v10 object
diff --git a/ld/testsuite/ld-cris/va-v32.d b/ld/testsuite/ld-cris/va-v32.d
index 81e8675..c94f9f9 100644
--- a/ld/testsuite/ld-cris/va-v32.d
+++ b/ld/testsuite/ld-cris/va-v32.d
@@ -1,6 +1,7 @@
# source: start1.s --march=v32
# source: move-1.s --march=common_v10_v32
-# ld:
+# as: --em=criself
+# ld: -m criself
# objdump: -p
# Test that linking a v10+v32 compatible object to a v32 object
diff --git a/ld/testsuite/ld-cris/weakref1.d b/ld/testsuite/ld-cris/weakref1.d
index 166d489..6dab5e4 100644
--- a/ld/testsuite/ld-cris/weakref1.d
+++ b/ld/testsuite/ld-cris/weakref1.d
@@ -1,5 +1,5 @@
#source: gotrel2.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: -m crislinux tmpdir/libdso-1.so
#objdump: -R
diff --git a/ld/testsuite/ld-cris/weakref2.d b/ld/testsuite/ld-cris/weakref2.d
index b991344..1546350 100644
--- a/ld/testsuite/ld-cris/weakref2.d
+++ b/ld/testsuite/ld-cris/weakref2.d
@@ -1,5 +1,5 @@
#source: gotrel2.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
#ld: -m crislinux tmpdir/libdso-1.so
#objdump: -s -j .got