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.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index b65c4017469dcdbbfffcc5e292af750e18717b4d..a089dd249667d5ab6179386b4f77eca806afedea 100644 (file)
--- 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 f8306f8ef603566bbbf7b9aeed525408da25cf1c..7ef703661066ec95e49980855d3028d38b258f28 100644 (file)
--- 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 9097c4f2d7958b06696814f52a95aa269ee09efa..a1fae23cff156f5367a757eb0c94f3eb14f8cce6 100644 (file)
--- 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 714396edfcf9f227eaf1b411c55667529a7f1780..6c5faa5991bdf2c6b9d6f2b3101bf87fc2a20d41 100644 (file)
--- 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 f16f8195a486c8ff0e3c4965444e53c0bec36296..34f2a5efeae5894b22a1579cb94c15c0dd5557c4 100644 (file)
--- 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 31ce664a31235ab6e30fce7601282266f6e1e4ae..e93205669a1f9c30ad196ca9b50b65ab2dcbd86c 100644 (file)
--- 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 f529cfe3f6fc3e737a3314547b2b4b9a6d898b0a..280f6516a4f9340d2237faa4190ab30ec9e91711 100644 (file)
--- 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 297b77b4781b469c11984244ad2aa8154395cd01..42b4712dd4039b15ea7839039bb0f638bff63567 100644 (file)
--- 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 cecba85781bb1c9bec2bf97b736f766c9899fcb8..be7a35a0d16270ed48c4e653880bf4e6755e3b50 100644 (file)
--- 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 222f18b7dc9d60ffa10ab1bac7749f59d708b855..e82370a348d2582655c5d9cdb42308a11bbab119 100644 (file)
--- 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 feddf711729e497b445eaadb820d6e848253072b..d60dd96ac0fd56ec85d119e51a61007a5d22293d 100644 (file)
--- 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 07d217a2feaa6e2cf04c601d1756efd5655f2f8f..e03c473701ee324b92fa2d0eaff139a61540e670 100644 (file)
--- 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 e491be98eaf256285daebdf1f8d7e648ac054360..cee53f59ab58255aaefba2cfae0e5f1beb5dd98b 100644 (file)
--- 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 91fc98a0732a2b234506f086e7a0363a06fda6cf..dec0ccd596588fd4008d8c9079ff13bce22d2f96 100644 (file)
--- 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 7b7171a43b8980997c33d4d5af95468af2555c54..d3a4a23e65861970a0ecab4502d367c7149d873a 100644 (file)
--- 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 440bec3bff606fc736df867b4ab9a35658e6bb7c..6646e4256c0340f0b1aeef7b73bfbe22a75dc993 100644 (file)
--- 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 f339ac22f2ef876554bd46f73d63fd336070d680..dc8451e3a0a322490a4ec554915f3665cbc347f0 100644 (file)
--- 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 b58f6701d6276ddbf7e1cd937952f7d39b64d1a5..a416557229f06db87ff298a91f9fea1289fd383a 100644 (file)
--- 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 2258927ab30fa19c5b78c28c922da8d727cf5497..ac84c43b19c325358fa53a75ae81c51c9fb7a332 100644 (file)
--- 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 c5d2a1b810a72e3ad6b9a21705b4c0aae66edc98..a3cc757eaf9779efe17686c139e0803414f751ad 100644 (file)
--- 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 91117972016e12b5f6d536304d52506038de2673..9e18c59e1abeb25e1e802bc0426766f21ec5284a 100644 (file)
--- 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 b94199c7e6b620af370e618f972b19d9dae49e50..b7cc84045b345240b3d7158e00611a6d4c864498 100644 (file)
--- 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 c13a2e065985ccc35ec23e5601b73c51b581f26f..3487a30b71fd5b8725b438cb108dd7a18046c398 100644 (file)
--- 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 784be297b610cd3d6a9178b2c18256349b88083d..829d22bb9918f2b18ee80a0c9b11b212674377c0 100644 (file)
--- 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 7d0b5f89128742ef435a79bacc2186f778546403..c1af092bf6e38f3448c06006bcc20d0dc90d788b 100644 (file)
--- 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 b090f36a8a97a7ee4e2b480400b931972d676887..ea8e154e59e6eacd350b7d5ba350d76a397a8f79 100644 (file)
--- 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 bcef0185464cef133b5b3343ef24d88cecadbb19..49ca3b64b2be19aa032cee7679e7cfb7ba393828 100644 (file)
--- 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 177fc1376953a62208ba798eb26d3e13f92c22b2..8e2e2b1bd5640013f965a9defa4e28d04fb87b16 100644 (file)
--- 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 9eeeb6729a583ae1208d124de53e5c1446f6f40e..70d007e1c6e8f7e12aa5c49ad06926313e0d995f 100644 (file)
--- 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 259f60ba55aced24400b3d4970f623d3d6434840..b66ee06f45383577fc963ef7f78bfb60be3a944c 100644 (file)
--- 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 6dd7ca8f63c2dd8c1b760e8c7af8acabea88983f..8bff7cb5f5111f83d4da18a759eaad48f02f8818 100644 (file)
--- 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 686b5342c425b385951705777dc8ccf2cdc858d5..7f716e87b3d85bf36e4578cf2afc241a40f11215 100644 (file)
--- 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 ef2d39ab5dbcee270bccb4f28e0aebf87bba1d49..02ce118460d19e28280852dd6a59f62bc61c6f12 100644 (file)
--- 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 27b477df2c80af1618983968961eca274e320453..e1dbe7d2233151b7fd0509708be237af5824bd27 100644 (file)
--- 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 4c516f6f724d3071a1d123befca35731edae1313..49126d5ac6c1c5b20037b59978ee220517f9a1b1 100644 (file)
--- 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 8612b5828fc3b9877ce52bac981f8950b6934461..ec09d6cc9f9529d295369bc335ebc1f094f75483 100644 (file)
--- 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 81e86751d38948244c83d20b669250c6df924279..c94f9f9c4a2e8b490ae458369fcb792da6720a04 100644 (file)
--- 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 166d48964af7108e57e04819855ae96f1c0b496d..6dab5e40f930ad0b424a2476ea31fbfb0778cf0d 100644 (file)
--- 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 b9913446f3ff4edbbca903fa4bbf210bc113973f..15463501ad1a2107399b6ef5a4911e0bce0796f2 100644 (file)
--- 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