gas and ld testsuite adjustments for cris-axis-aout

Hans-Peter Nilsson hans-peter.nilsson@axis.com
Tue Mar 8 02:34:00 GMT 2005


As promised.  Committed.

gas/testsuite:
	Adjust testsuite for cris-axis-aout.
	* gas/cris/rd-bcnst.d, gas/cris/rd-usp-1.d: Adjust regexps for a.out output.
	* gas/cris/mulbug-err-1.s, gas/cris/rd-arch-1.d,
	gas/cris/rd-arch-2.d, gas/cris/rd-arch-3.d, gas/cris/rd-break32.d,
	gas/cris/rd-pcrel2.d, gas/cris/rd-ppv1032.d, gas/cris/rd-ppv32.d,
	gas/cris/rd-usp-1b.d, gas/cris/v32-err-7.s: Pass --em=criself.

ld/testsuite:
	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.


Index: gas/testsuite/gas/cris/mulbug-err-1.s
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/mulbug-err-1.s,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 mulbug-err-1.s
--- gas/testsuite/gas/cris/mulbug-err-1.s	21 Mar 2004 23:47:54 -0000	1.1
+++ gas/testsuite/gas/cris/mulbug-err-1.s	8 Mar 2005 01:53:44 -0000
@@ -2,6 +2,7 @@
 ; a hardware bug.
 
 ;  { dg-do assemble { target cris-*-* } }
+;  { dg-options "--em=criself" }
 
  ; First, .text isn't dword-aligned by default.
  .text
Index: gas/testsuite/gas/cris/rd-arch-1.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-arch-1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-arch-1.d
--- gas/testsuite/gas/cris/rd-arch-1.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-arch-1.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #source: arch-err-2.s
-#as: --march=v32
+#as: --march=v32 --em=criself
 #objdump: -p
 
 #...
Index: gas/testsuite/gas/cris/rd-arch-2.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-arch-2.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-arch-2.d
--- gas/testsuite/gas/cris/rd-arch-2.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-arch-2.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #source: arch-err-4.s
-#as: --march=common_v10_v32
+#as: --march=common_v10_v32 --em=criself
 #objdump: -p
 
 #...
Index: gas/testsuite/gas/cris/rd-arch-3.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-arch-3.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-arch-3.d
--- gas/testsuite/gas/cris/rd-arch-3.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-arch-3.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #source: arch-err-5.s
-#as: --march=v0_v10
+#as: --march=v0_v10 --em=criself
 #objdump: -p
 
 #...
Index: gas/testsuite/gas/cris/rd-bcnst.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-bcnst.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-bcnst.d
--- gas/testsuite/gas/cris/rd-bcnst.d	26 Nov 2002 08:19:09 -0000	1.1
+++ gas/testsuite/gas/cris/rd-bcnst.d	8 Mar 2005 01:53:44 -0000
@@ -8,15 +8,15 @@
 Disassembly of section \.text:
 
 0+ <\.text>:
-[ 	]+0:[ 	]+08e0[ 	]+ba 0xa
+[ 	]+0:[ 	]+08e0[ 	]+ba (0xa|a <.*)
 [ 	]+2:[ 	]+0f05[ 	]+nop 
-[ 	]+4:[ 	]+3f0d 00db ba00[ 	]+jump 0xbadb00
-[ 	]+a:[ 	]+f970[ 	]+bmi 0x4
-[ 	]+c:[ 	]+08e0[ 	]+ba 0x16
+[ 	]+4:[ 	]+3f0d 00db ba00[ 	]+jump (0xbadb00|badb00 <.*)
+[ 	]+a:[ 	]+f970[ 	]+bmi (0x4|4 <.*)
+[ 	]+c:[ 	]+08e0[ 	]+ba (0x16|16 <.*)
 [ 	]+e:[ 	]+0f05[ 	]+nop 
-[ 	]+10:[ 	]+3f0d 000b 0000[ 	]+jump 0xb00
-[ 	]+16:[ 	]+f970[ 	]+bmi 0x10
-[ 	]+18:[ 	]+08e0[ 	]+ba 0x22
+[ 	]+10:[ 	]+3f0d 000b 0000[ 	]+jump (0xb00|b00 <.*)
+[ 	]+16:[ 	]+f970[ 	]+bmi (0x10|10 <.*)
+[ 	]+18:[ 	]+08e0[ 	]+ba (0x22|22 <.*)
 [ 	]+1a:[ 	]+0f05[ 	]+nop 
-[ 	]+1c:[ 	]+3f0d 4200 0000[ 	]+jump 0x42
-[ 	]+22:[ 	]+f970[ 	]+bmi 0x1c
+[ 	]+1c:[ 	]+3f0d 4200 0000[ 	]+jump (0x42|42 <.*)
+[ 	]+22:[ 	]+f970[ 	]+bmi (0x1c|1c <.*)
Index: gas/testsuite/gas/cris/rd-break32.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-break32.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-break32.d
--- gas/testsuite/gas/cris/rd-break32.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-break32.d	8 Mar 2005 01:53:44 -0000
@@ -1,4 +1,4 @@
-#as: --march=v32
+#as: --march=v32 --em=criself
 #source: break.s
 #objdump: -dr
 
Index: gas/testsuite/gas/cris/rd-pcrel2.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-pcrel2.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 rd-pcrel2.d
--- gas/testsuite/gas/cris/rd-pcrel2.d	25 Sep 2003 13:06:56 -0000	1.3
+++ gas/testsuite/gas/cris/rd-pcrel2.d	8 Mar 2005 01:53:44 -0000
@@ -1,4 +1,5 @@
 #objdump: -dr
+#as: --em=criself
 
 .*:     file format .*-cris
 
Index: gas/testsuite/gas/cris/rd-ppv1032.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-ppv1032.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-ppv1032.d
--- gas/testsuite/gas/cris/rd-ppv1032.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-ppv1032.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --march=common_v10_v32
+#as: --march=common_v10_v32 --em=criself
 #objdump: -dr
 #name: pushpopv1032
 
Index: gas/testsuite/gas/cris/rd-ppv32.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-ppv32.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-ppv32.d
--- gas/testsuite/gas/cris/rd-ppv32.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-ppv32.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --march=v32
+#as: --march=v32 --em=criself
 #objdump: -dr
 #name: pushpopv32
 
Index: gas/testsuite/gas/cris/rd-usp-1.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-usp-1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-usp-1.d
--- gas/testsuite/gas/cris/rd-usp-1.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-usp-1.d	8 Mar 2005 01:53:44 -0000
@@ -4,12 +4,12 @@
 
 # Check that USP gets the right number for V10.
 
-.*:     file format elf32-us-cris
+.*:     file format .*-cris
 
 Disassembly of section \.text:
 
 0+ <\.text>:
    0:	3af6                	move r10,usp
-   2:	3ffe b0ab 0f00      	move 0xfabb0,usp
+   2:	3ffe b0ab 0f00      	move (0xfabb0|fabb0 <.*>),usp
    8:	75fa                	move usp,\[r5\]
    a:	3cfa                	move \[r12\],usp
Index: gas/testsuite/gas/cris/rd-usp-1b.d
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/rd-usp-1b.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 rd-usp-1b.d
--- gas/testsuite/gas/cris/rd-usp-1b.d	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/rd-usp-1b.d	8 Mar 2005 01:53:44 -0000
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --march=v32
+#as: --march=v32 --em=criself
 #source: v32-err-8.s
 
 # Check that USP gets the right number for V32.
Index: gas/testsuite/gas/cris/v32-err-7.s
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cris/v32-err-7.s,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v32-err-7.s
--- gas/testsuite/gas/cris/v32-err-7.s	4 Nov 2004 15:03:06 -0000	1.1
+++ gas/testsuite/gas/cris/v32-err-7.s	8 Mar 2005 01:53:44 -0000
@@ -1,6 +1,6 @@
 ; Error for lapcq out-of-range.
 ; { dg-do assemble }
-; { dg-options "--march=v32" }
+; { dg-options "--march=v32 --em=criself" }
 
 a:
  nop
Index: ld/testsuite/ld-cris/badgotr1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/badgotr1.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 badgotr1.d
--- ld/testsuite/ld-cris/badgotr1.d	16 Jun 2003 00:02:20 -0000	1.2
+++ ld/testsuite/ld-cris/badgotr1.d	8 Mar 2005 01:53:46 -0000
@@ -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$
Index: ld/testsuite/ld-cris/expdyn1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn1.d,v
retrieving revision 1.4
diff -c -p -u -p -r1.4 expdyn1.d
--- ld/testsuite/ld-cris/expdyn1.d	2 Nov 2004 05:40:04 -0000	1.4
+++ ld/testsuite/ld-cris/expdyn1.d	8 Mar 2005 01:53:46 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn2.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn2.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 expdyn2.d
--- ld/testsuite/ld-cris/expdyn2.d	12 Jul 2002 15:51:54 -0000	1.1
+++ ld/testsuite/ld-cris/expdyn2.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn3.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn3.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 expdyn3.d
--- ld/testsuite/ld-cris/expdyn3.d	12 Jul 2002 15:51:54 -0000	1.1
+++ ld/testsuite/ld-cris/expdyn3.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn4.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn4.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 expdyn4.d
--- ld/testsuite/ld-cris/expdyn4.d	12 Jul 2002 15:51:54 -0000	1.1
+++ ld/testsuite/ld-cris/expdyn4.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn5.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn5.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 expdyn5.d
--- ld/testsuite/ld-cris/expdyn5.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/expdyn5.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn6.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn6.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 expdyn6.d
--- ld/testsuite/ld-cris/expdyn6.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/expdyn6.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/expdyn7.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/expdyn7.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 expdyn7.d
--- ld/testsuite/ld-cris/expdyn7.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/expdyn7.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/gotplt1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/gotplt1.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 gotplt1.d
--- ld/testsuite/ld-cris/gotplt1.d	2 Nov 2004 05:40:04 -0000	1.2
+++ ld/testsuite/ld-cris/gotplt1.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/gotplt2.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/gotplt2.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 gotplt2.d
--- ld/testsuite/ld-cris/gotplt2.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/gotplt2.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/gotplt3.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/gotplt3.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 gotplt3.d
--- ld/testsuite/ld-cris/gotplt3.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/gotplt3.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/hiddef1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/hiddef1.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 hiddef1.d
--- ld/testsuite/ld-cris/hiddef1.d	2 Nov 2004 05:40:04 -0000	1.2
+++ ld/testsuite/ld-cris/hiddef1.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/libdso-1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-1.d,v
retrieving revision 1.4
diff -c -p -u -p -r1.4 libdso-1.d
--- ld/testsuite/ld-cris/libdso-1.d	21 Aug 2004 12:51:41 -0000	1.4
+++ ld/testsuite/ld-cris/libdso-1.d	8 Mar 2005 01:53:47 -0000
@@ -1,5 +1,5 @@
 #source: dso-1.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
 #ld: --shared -m crislinux
 #objdump: -T
 
Index: ld/testsuite/ld-cris/libdso-10.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-10.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-10.d
--- ld/testsuite/ld-cris/libdso-10.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-10.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-11.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-11.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-11.d
--- ld/testsuite/ld-cris/libdso-11.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-11.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-12.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-12.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-12.d
--- ld/testsuite/ld-cris/libdso-12.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-12.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-13.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-13.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 libdso-13.d
--- ld/testsuite/ld-cris/libdso-13.d	7 Feb 2005 03:41:26 -0000	1.2
+++ ld/testsuite/ld-cris/libdso-13.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/libdso-14.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-14.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-14.d
--- ld/testsuite/ld-cris/libdso-14.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-14.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-2.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-2.d,v
retrieving revision 1.4
diff -c -p -u -p -r1.4 libdso-2.d
--- ld/testsuite/ld-cris/libdso-2.d	2 Nov 2004 05:40:04 -0000	1.4
+++ ld/testsuite/ld-cris/libdso-2.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-3.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-3.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-3.d
--- ld/testsuite/ld-cris/libdso-3.d	9 Jul 2002 03:46:49 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-3.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/libdso-4.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/libdso-4.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 libdso-4.d
--- ld/testsuite/ld-cris/libdso-4.d	15 Aug 2002 05:19:32 -0000	1.1
+++ ld/testsuite/ld-cris/libdso-4.d	8 Mar 2005 01:53:47 -0000
@@ -1,5 +1,5 @@
 #source: dso-2.s
-#as: --pic --no-underscore
+#as: --pic --no-underscore --em=criself
 #ld: --shared -m crislinux
 #objdump: -T
 
Index: ld/testsuite/ld-cris/locref1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/locref1.d,v
retrieving revision 1.3
diff -c -p -u -p -r1.3 locref1.d
--- ld/testsuite/ld-cris/locref1.d	2 Nov 2004 05:40:04 -0000	1.3
+++ ld/testsuite/ld-cris/locref1.d	8 Mar 2005 01:53:47 -0000
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic
+#as: --no-underscore --pic --em=criself
 #source: expdyn1.s
 #source: locref1.s
 #ld: -m crislinux
Index: ld/testsuite/ld-cris/locref2.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/locref2.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 locref2.d
--- ld/testsuite/ld-cris/locref2.d	2 Nov 2004 05:40:04 -0000	1.2
+++ ld/testsuite/ld-cris/locref2.d	8 Mar 2005 01:53:47 -0000
@@ -1,4 +1,4 @@
-#as: --no-underscore --pic
+#as: --no-underscore --pic --em=criself
 #source: gotrel1.s
 #source: locref2.s
 #ld: -m crislinux
Index: ld/testsuite/ld-cris/nodyn4.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/nodyn4.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 nodyn4.d
--- ld/testsuite/ld-cris/nodyn4.d	21 Aug 2004 12:51:41 -0000	1.2
+++ ld/testsuite/ld-cris/nodyn4.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/nodyn5.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/nodyn5.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 nodyn5.d
--- ld/testsuite/ld-cris/nodyn5.d	21 Aug 2004 12:51:41 -0000	1.2
+++ ld/testsuite/ld-cris/nodyn5.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/noglob1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/noglob1.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 noglob1.d
--- ld/testsuite/ld-cris/noglob1.d	16 Jun 2003 00:02:20 -0000	1.2
+++ ld/testsuite/ld-cris/noglob1.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/pv32-1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/pv32-1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 pv32-1.d
--- ld/testsuite/ld-cris/pv32-1.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/pv32-1.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/undef1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/undef1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 undef1.d
--- ld/testsuite/ld-cris/undef1.d	15 Aug 2002 05:19:32 -0000	1.1
+++ ld/testsuite/ld-cris/undef1.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/v10-v32.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v10-v32.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v10-v32.d
--- ld/testsuite/ld-cris/v10-v32.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v10-v32.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/v10-va.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v10-va.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v10-va.d
--- ld/testsuite/ld-cris/v10-va.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v10-va.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/v32-ba-1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v32-ba-1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v32-ba-1.d
--- ld/testsuite/ld-cris/v32-ba-1.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v32-ba-1.d	8 Mar 2005 01:53:47 -0000
@@ -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.
Index: ld/testsuite/ld-cris/v32-bin-1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v32-bin-1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v32-bin-1.d
--- ld/testsuite/ld-cris/v32-bin-1.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v32-bin-1.d	8 Mar 2005 01:53:47 -0000
@@ -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.
Index: ld/testsuite/ld-cris/v32-v10.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v32-v10.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v32-v10.d
--- ld/testsuite/ld-cris/v32-v10.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v32-v10.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/v32-va.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/v32-va.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 v32-va.d
--- ld/testsuite/ld-cris/v32-va.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/v32-va.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/va-v10.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/va-v10.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 va-v10.d
--- ld/testsuite/ld-cris/va-v10.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/va-v10.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/va-v32.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/va-v32.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 va-v32.d
--- ld/testsuite/ld-cris/va-v32.d	4 Nov 2004 15:04:05 -0000	1.1
+++ ld/testsuite/ld-cris/va-v32.d	8 Mar 2005 01:53:47 -0000
@@ -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
Index: ld/testsuite/ld-cris/weakref1.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/weakref1.d,v
retrieving revision 1.1
diff -c -p -u -p -r1.1 weakref1.d
--- ld/testsuite/ld-cris/weakref1.d	31 Jan 2002 10:42:18 -0000	1.1
+++ ld/testsuite/ld-cris/weakref1.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
Index: ld/testsuite/ld-cris/weakref2.d
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-cris/weakref2.d,v
retrieving revision 1.2
diff -c -p -u -p -r1.2 weakref2.d
--- ld/testsuite/ld-cris/weakref2.d	2 Nov 2004 05:40:04 -0000	1.2
+++ ld/testsuite/ld-cris/weakref2.d	8 Mar 2005 01:53:47 -0000
@@ -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
 
brgds, H-P



More information about the Binutils mailing list