diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8769953e51..814571e530 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-09-01  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gas/cris: Adjust all files for testing target
+	cris-axis-linux-gnu.
+
 2005-08-30  Paul Brook  <paul@codesourcery.com>
 
 	* gas/arm/thumb.d: Change "sub rn, rn, rn" to "subs rn, rn, rn".
diff --git a/gas/testsuite/gas/cris/brokw-3.d b/gas/testsuite/gas/cris/brokw-3.d
index bbf04832f5..139e3a5d19 100644
--- a/gas/testsuite/gas/cris/brokw-3.d
+++ b/gas/testsuite/gas/cris/brokw-3.d
@@ -1,4 +1,5 @@
 #objdump: -dr
+#as: --underscore
 #name: brokw-3
 
 .*:     file format .*-cris
diff --git a/gas/testsuite/gas/cris/rd-abs32-2.d b/gas/testsuite/gas/cris/rd-abs32-2.d
index d13c8a8c5d..20fc30205a 100644
--- a/gas/testsuite/gas/cris/rd-abs32-2.d
+++ b/gas/testsuite/gas/cris/rd-abs32-2.d
@@ -6,7 +6,7 @@
 # assemble and disassemble correctly for v32 given "old-style"
 # mnemonics.
 
-.*:     file format elf32-us-cris
+.*:     file format elf32.*-cris
 
 Disassembly of section \.text:
 
diff --git a/gas/testsuite/gas/cris/rd-arch-1.d b/gas/testsuite/gas/cris/rd-arch-1.d
index 52f19c80a8..12c6c6ee7a 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 --em=criself
+#as: --march=v32 --underscore --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 6f7d069dec..69e5b6fb54 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 --em=criself
+#as: --underscore --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 9039e8d9dd..022c1f01cc 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 --em=criself
+#as: --march=v0_v10 --underscore --em=criself
 #objdump: -p
 
 #...
diff --git a/gas/testsuite/gas/cris/rd-bkw1b.d b/gas/testsuite/gas/cris/rd-bkw1b.d
index 7d4978fd3e..19e9d71b29 100644
--- a/gas/testsuite/gas/cris/rd-bkw1b.d
+++ b/gas/testsuite/gas/cris/rd-bkw1b.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #source: brokw-1.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-bkw2b.d b/gas/testsuite/gas/cris/rd-bkw2b.d
index 15c727dc43..1d268b3a44 100644
--- a/gas/testsuite/gas/cris/rd-bkw2b.d
+++ b/gas/testsuite/gas/cris/rd-bkw2b.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #source: brokw-2.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-bkw3b.d b/gas/testsuite/gas/cris/rd-bkw3b.d
index 8e3ac4e25a..4a7cca9bb2 100644
--- a/gas/testsuite/gas/cris/rd-bkw3b.d
+++ b/gas/testsuite/gas/cris/rd-bkw3b.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #source: brokw-3b.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-bound1.d b/gas/testsuite/gas/cris/rd-bound1.d
index 44d5f7ca5c..40bfd34b8c 100644
--- a/gas/testsuite/gas/cris/rd-bound1.d
+++ b/gas/testsuite/gas/cris/rd-bound1.d
@@ -1,4 +1,4 @@
-#as: --em=criself
+#as: --underscore --em=criself
 #objdump: -dr
 .*:     file format elf32-us-cris
 Disassembly of section \.text:
diff --git a/gas/testsuite/gas/cris/rd-bound2.d b/gas/testsuite/gas/cris/rd-bound2.d
index d249e6d11a..e0aec151f7 100644
--- a/gas/testsuite/gas/cris/rd-bound2.d
+++ b/gas/testsuite/gas/cris/rd-bound2.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #source: rd-bound1.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-bound3.d b/gas/testsuite/gas/cris/rd-bound3.d
index d467e59f62..874c29016e 100644
--- a/gas/testsuite/gas/cris/rd-bound3.d
+++ b/gas/testsuite/gas/cris/rd-bound3.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v10
+#as: --underscore --em=criself --march=v10
 #source: bound-err-1.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-bound4.d b/gas/testsuite/gas/cris/rd-bound4.d
index 381a44e650..1b0670ab26 100644
--- a/gas/testsuite/gas/cris/rd-bound4.d
+++ b/gas/testsuite/gas/cris/rd-bound4.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=common_v10_v32
+#as: --underscore --em=criself --march=common_v10_v32
 #source: rd-bound1.s
 #objdump: -dr
 
diff --git a/gas/testsuite/gas/cris/rd-pic-2.d b/gas/testsuite/gas/cris/rd-pic-2.d
index a34e35025f..ce75451cd1 100644
--- a/gas/testsuite/gas/cris/rd-pic-2.d
+++ b/gas/testsuite/gas/cris/rd-pic-2.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --em=criself --pic
+#as: --underscore --em=criself --pic
 
 # Check that 16-bit PIC relocs aren't overflowing.
 # PR gas/1049.
diff --git a/gas/testsuite/gas/cris/rd-ppv1032.d b/gas/testsuite/gas/cris/rd-ppv1032.d
index 159648f867..4f64ce1938 100644
--- a/gas/testsuite/gas/cris/rd-ppv1032.d
+++ b/gas/testsuite/gas/cris/rd-ppv1032.d
@@ -1,7 +1,6 @@
 #source: pushpopv32.s
-#as: --march=common_v10_v32 --em=criself
+#as: --underscore --march=common_v10_v32 --em=criself
 #objdump: -dr
-#name: pushpopv1032
 
 .*:[ 	]+file format .*-cris
 
diff --git a/gas/testsuite/gas/cris/rd-ppv32.d b/gas/testsuite/gas/cris/rd-ppv32.d
index e84ff30241..52355ffe22 100644
--- a/gas/testsuite/gas/cris/rd-ppv32.d
+++ b/gas/testsuite/gas/cris/rd-ppv32.d
@@ -1,7 +1,6 @@
 #source: pushpopv32.s
-#as: --march=v32 --em=criself
+#as: --underscore --march=v32 --em=criself
 #objdump: -dr
-#name: pushpopv32
 
 .*:[ 	]+file format .*-cris
 
diff --git a/gas/testsuite/gas/cris/rd-spr-1.d b/gas/testsuite/gas/cris/rd-spr-1.d
index 347b0b30bb..a7f28c70f5 100644
--- a/gas/testsuite/gas/cris/rd-spr-1.d
+++ b/gas/testsuite/gas/cris/rd-spr-1.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Check support for support function register names.
diff --git a/gas/testsuite/gas/cris/rd-usp-1.d b/gas/testsuite/gas/cris/rd-usp-1.d
index 80bf7a9d22..7e1a5db588 100644
--- a/gas/testsuite/gas/cris/rd-usp-1.d
+++ b/gas/testsuite/gas/cris/rd-usp-1.d
@@ -1,5 +1,5 @@
 #objdump: -dr
-#as: --march=v10
+#as: --underscore --march=v10
 #source: v32-err-8.s
 
 # Check that USP gets the right number for V10.
diff --git a/gas/testsuite/gas/cris/rd-usp-1b.d b/gas/testsuite/gas/cris/rd-usp-1b.d
index b808f8425b..40a92fe054 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 --em=criself
+#as: --underscore --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/rd-v10_32o-1.d b/gas/testsuite/gas/cris/rd-v10_32o-1.d
index d3c8c42622..d9f43531a6 100644
--- a/gas/testsuite/gas/cris/rd-v10_32o-1.d
+++ b/gas/testsuite/gas/cris/rd-v10_32o-1.d
@@ -1,5 +1,5 @@
 #source: break.s
-#as: --em=criself --march=common_v10_v32
+#as: --underscore --em=criself --march=common_v10_v32
 #objdump: -p
 
 # Check that different command-line options result in different
diff --git a/gas/testsuite/gas/cris/rd-v10_32o-2.d b/gas/testsuite/gas/cris/rd-v10_32o-2.d
index d4b51a9c7a..73c240f13b 100644
--- a/gas/testsuite/gas/cris/rd-v10_32o-2.d
+++ b/gas/testsuite/gas/cris/rd-v10_32o-2.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=common_v10_v32
+#as: --underscore --em=criself --march=common_v10_v32
 #objdump: -dr
 
 # Check that branch offsets are computed as for v32.  The
diff --git a/gas/testsuite/gas/cris/rd-v32-b1.d b/gas/testsuite/gas/cris/rd-v32-b1.d
index 1b44a87428..52823994de 100644
--- a/gas/testsuite/gas/cris/rd-v32-b1.d
+++ b/gas/testsuite/gas/cris/rd-v32-b1.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32-b2.d b/gas/testsuite/gas/cris/rd-v32-b2.d
index 69b8f59c31..9439b9e859 100644
--- a/gas/testsuite/gas/cris/rd-v32-b2.d
+++ b/gas/testsuite/gas/cris/rd-v32-b2.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32-b3.d b/gas/testsuite/gas/cris/rd-v32-b3.d
index c8a14aef80..fee75df97c 100644
--- a/gas/testsuite/gas/cris/rd-v32-b3.d
+++ b/gas/testsuite/gas/cris/rd-v32-b3.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Check expansion of "ba" into dword operands for different segment.
diff --git a/gas/testsuite/gas/cris/rd-v32-f1.d b/gas/testsuite/gas/cris/rd-v32-f1.d
index e1e225dc25..d97c38e3b6 100644
--- a/gas/testsuite/gas/cris/rd-v32-f1.d
+++ b/gas/testsuite/gas/cris/rd-v32-f1.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Test that v32 flags are properly recognized and emitted at disassembly.
diff --git a/gas/testsuite/gas/cris/rd-v32-i1.d b/gas/testsuite/gas/cris/rd-v32-i1.d
index 94aaaf3c53..def1e49900 100644
--- a/gas/testsuite/gas/cris/rd-v32-i1.d
+++ b/gas/testsuite/gas/cris/rd-v32-i1.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Test that addc recognizes constant operands.
diff --git a/gas/testsuite/gas/cris/rd-v32-l1.d b/gas/testsuite/gas/cris/rd-v32-l1.d
index d9997d24aa..231f0e7ac5 100644
--- a/gas/testsuite/gas/cris/rd-v32-l1.d
+++ b/gas/testsuite/gas/cris/rd-v32-l1.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32-l3.d b/gas/testsuite/gas/cris/rd-v32-l3.d
index dfe6cfb39e..59a8174419 100644
--- a/gas/testsuite/gas/cris/rd-v32-l3.d
+++ b/gas/testsuite/gas/cris/rd-v32-l3.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32-l4.d b/gas/testsuite/gas/cris/rd-v32-l4.d
index 8facb8a52a..4afd3fb9a9 100644
--- a/gas/testsuite/gas/cris/rd-v32-l4.d
+++ b/gas/testsuite/gas/cris/rd-v32-l4.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Test that lapc shrinks to lapcq and that offsets are emitted correctly.
diff --git a/gas/testsuite/gas/cris/rd-v32o-1.d b/gas/testsuite/gas/cris/rd-v32o-1.d
index 874b3dfa27..24bfcda117 100644
--- a/gas/testsuite/gas/cris/rd-v32o-1.d
+++ b/gas/testsuite/gas/cris/rd-v32o-1.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -p
 
 # Check that different command-line options result in different
diff --git a/gas/testsuite/gas/cris/rd-v32s-1.d b/gas/testsuite/gas/cris/rd-v32s-1.d
index 9b38e1eaaa..b4f85be8c4 100644
--- a/gas/testsuite/gas/cris/rd-v32s-1.d
+++ b/gas/testsuite/gas/cris/rd-v32s-1.d
@@ -1,5 +1,5 @@
 #source: v32-err-1.s
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 # Check that v32 insns that are expected to give syntax errors
diff --git a/gas/testsuite/gas/cris/rd-v32s-2.d b/gas/testsuite/gas/cris/rd-v32s-2.d
index c6546f1781..446cadc291 100644
--- a/gas/testsuite/gas/cris/rd-v32s-2.d
+++ b/gas/testsuite/gas/cris/rd-v32s-2.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32s-3.d b/gas/testsuite/gas/cris/rd-v32s-3.d
index 8ad5e84e16..27d75aa6dc 100644
--- a/gas/testsuite/gas/cris/rd-v32s-3.d
+++ b/gas/testsuite/gas/cris/rd-v32s-3.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-v32s-4.d b/gas/testsuite/gas/cris/rd-v32s-4.d
index 21bcf31cd6..516dcc8a1c 100644
--- a/gas/testsuite/gas/cris/rd-v32s-4.d
+++ b/gas/testsuite/gas/cris/rd-v32s-4.d
@@ -1,4 +1,4 @@
-#as: --em=criself --march=v32
+#as: --underscore --em=criself --march=v32
 #objdump: -dr
 
 .*:     file format elf32-us-cris
diff --git a/gas/testsuite/gas/cris/rd-vao-1.d b/gas/testsuite/gas/cris/rd-vao-1.d
index 4e9cd93936..14b68bdd0c 100644
--- a/gas/testsuite/gas/cris/rd-vao-1.d
+++ b/gas/testsuite/gas/cris/rd-vao-1.d
@@ -1,5 +1,5 @@
 #source: abs32-1.s
-#as: --em=criself --march=v0_v10
+#as: --underscore --em=criself --march=v0_v10
 #objdump: -p
 
 # Check that different command-line options result in different
diff --git a/gas/testsuite/gas/cris/v32-err-2.s b/gas/testsuite/gas/cris/v32-err-2.s
index 4139d35985..0a5a3767f3 100644
--- a/gas/testsuite/gas/cris/v32-err-2.s
+++ b/gas/testsuite/gas/cris/v32-err-2.s
@@ -1,5 +1,5 @@
 ; { dg-do assemble }
-; { dg-options "--march=common_v10_v32 --em=criself" }
+; { dg-options " --underscore --march=common_v10_v32 --em=criself" }
 ; { dg-error ".word offset handling is not implemented" "err for broken .word" { target cris-*-* } 0 }
 
 ; Tests that broken words don't crash, just give a message when
diff --git a/gas/testsuite/gas/cris/v32-err-3.s b/gas/testsuite/gas/cris/v32-err-3.s
index 0cbfda0769..4c2d1ec984 100644
--- a/gas/testsuite/gas/cris/v32-err-3.s
+++ b/gas/testsuite/gas/cris/v32-err-3.s
@@ -1,7 +1,7 @@
 ; Error for flags not applicable to current arch.
 ; #1: Error for pre-v32 flags for v32.
 ; { dg-do assemble }
-; { dg-options "--march=v32" }
+; { dg-options " --underscore --march=v32" }
 
 y:
  clearf d	; { dg-error "(Illegal|Invalid) operands" }