13 files changed, 30 insertions, 19 deletions
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 21a8ff6c..7b3cf0f 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2005-03-08  Hans-Peter Nilsson  <hp@axis.com>
+
+	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.
+
 2005-03-04  David Daney  <ddaney@avtrex.com>
 
 	* gas/mips/elf-rel23b.d: Use '__gnu_local_gp' instead of '_gp'
diff --git a/gas/testsuite/gas/cris/mulbug-err-1.s b/gas/testsuite/gas/cris/mulbug-err-1.s
index fbd8303..b8a0d9c 100644
--- a/gas/testsuite/gas/cris/mulbug-err-1.s
+++ b/gas/testsuite/gas/cris/mulbug-err-1.s
@@ -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
diff --git a/gas/testsuite/gas/cris/rd-arch-1.d b/gas/testsuite/gas/cris/rd-arch-1.d
index a3bd076..52f19c8 100644
--- a/gas/testsuite/gas/cris/rd-arch-1.d
+++ b/gas/testsuite/gas/cris/rd-arch-1.d
@@ -1,5 +1,5 @@
 #source: arch-err-2.s
-#as: --march=v32
+#as: --march=v32 --em=criself
 #objdump: -p
 
 #...
diff --git a/gas/testsuite/gas/cris/rd-arch-2.d b/gas/testsuite/gas/cris/rd-arch-2.d
index 8886a72..6f7d069 100644
--- a/gas/testsuite/gas/cris/rd-arch-2.d
+++ b/gas/testsuite/gas/cris/rd-arch-2.d
@@ -1,5 +1,5 @@
 #source: arch-err-4.s
-#as: --march=common_v10_v32
+#as: --march=common_v10_v32 --em=criself
 #objdump: -p
 
 #...
diff --git a/gas/testsuite/gas/cris/rd-arch-3.d b/gas/testsuite/gas/cris/rd-arch-3.d
index e77ff0d..9039e8d 100644
--- a/gas/testsuite/gas/cris/rd-arch-3.d
+++ b/gas/testsuite/gas/cris/rd-arch-3.d
@@ -1,5 +1,5 @@
 #source: arch-err-5.s
-#as: --march=v0_v10
+#as: --march=v0_v10 --em=criself
 #objdump: -p
 
 #...
diff --git a/gas/testsuite/gas/cris/rd-bcnst.d b/gas/testsuite/gas/cris/rd-bcnst.d
index f210666..80e9716 100644
--- a/gas/testsuite/gas/cris/rd-bcnst.d
+++ b/gas/testsuite/gas/cris/rd-bcnst.d
@@ -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 <.*)
diff --git a/gas/testsuite/gas/cris/rd-break32.d b/gas/testsuite/gas/cris/rd-break32.d
index 7959ecf..ba7c518 100644
--- a/gas/testsuite/gas/cris/rd-break32.d
+++ b/gas/testsuite/gas/cris/rd-break32.d
@@ -1,4 +1,4 @@
-#as: --march=v32
+#as: --march=v32 --em=criself
 #source: break.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-pcrel2.d b/gas/testsuite/gas/cris/rd-pcrel2.d
index 8dac5ca..2b401e7 100644
--- a/gas/testsuite/gas/cris/rd-pcrel2.d
+++ b/gas/testsuite/gas/cris/rd-pcrel2.d
@@ -1,4 +1,5 @@
 #objdump: -dr
+#as: --em=criself
 
 .*:     file format .*-cris
 
diff --git a/gas/testsuite/gas/cris/rd-ppv1032.d b/gas/testsuite/gas/cris/rd-ppv1032.d
index d545fbd..159648f 100644
--- a/gas/testsuite/gas/cris/rd-ppv1032.d
+++ b/gas/testsuite/gas/cris/rd-ppv1032.d
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --march=common_v10_v32
+#as: --march=common_v10_v32 --em=criself
 #objdump: -dr
 #name: pushpopv1032
 
diff --git a/gas/testsuite/gas/cris/rd-ppv32.d b/gas/testsuite/gas/cris/rd-ppv32.d
index abc74fb..e84ff30 100644
--- a/gas/testsuite/gas/cris/rd-ppv32.d
+++ b/gas/testsuite/gas/cris/rd-ppv32.d
@@ -1,5 +1,5 @@
 #source: pushpopv32.s
-#as: --march=v32
+#as: --march=v32 --em=criself
 #objdump: -dr
 #name: pushpopv32
 
diff --git a/gas/testsuite/gas/cris/rd-usp-1.d b/gas/testsuite/gas/cris/rd-usp-1.d
index 2ded594..80bf7a9 100644
--- a/gas/testsuite/gas/cris/rd-usp-1.d
+++ b/gas/testsuite/gas/cris/rd-usp-1.d
@@ -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
diff --git a/gas/testsuite/gas/cris/rd-usp-1b.d b/gas/testsuite/gas/cris/rd-usp-1b.d
index 07fa6c5..b808f84 100644
--- a/gas/testsuite/gas/cris/rd-usp-1b.d
+++ b/gas/testsuite/gas/cris/rd-usp-1b.d
@@ -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.
diff --git a/gas/testsuite/gas/cris/v32-err-7.s b/gas/testsuite/gas/cris/v32-err-7.s
index 572ff20..72b6503 100644
--- a/gas/testsuite/gas/cris/v32-err-7.s
+++ b/gas/testsuite/gas/cris/v32-err-7.s
@@ -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