* gas/cris: Adjust all files for testing target

	cris-axis-linux-gnu.

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 8769953e51340bea488b22d505b0f4c97d7442f4..814571e530705707840119364c6e4eac345897fb 100644 (file)
--- 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 bbf04832f59e9568648d66a7e4eecbfda8a9c642..139e3a5d191bfcb5862f699cd9375fe6c276c049 100644 (file)
--- 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 d13c8a8c5d71b9ea53a94a3f1f52e2d8decb6ecc..20fc30205aefbec04fc359b43659c812fbb103ae 100644 (file)
--- 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 52f19c80a84cc6fb25cc4ef866ffab89b70aab78..12c6c6ee7a56fdcac1cbe4808586f4f0b72dc896 100644 (file)
--- 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 6f7d069dec60fa4bafa7fee29fe9e97a73cfbbe6..69e5b6fb54187553ebbf96066c725f9958f360fc 100644 (file)
--- 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 9039e8d9dd385e1b0ae0d81fa9a7a044809fa2a8..022c1f01cc11d775fcd8108137cb77e035054e32 100644 (file)
--- 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 7d4978fd3e33a2cfe9d5cd5f56e61d2918c6d047..19e9d71b299ae098afdca870a993ba7246fcd18b 100644 (file)
--- 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 15c727dc431b184514ec5d4742caabd0b13db787..1d268b3a44c08362e66f55ec5bd6f1e7320e43f1 100644 (file)
--- 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 8e3ac4e25aa7fca1778ca5bee1d18c4227d21908..4a7cca9bb2e2e01da0739b38371cbca62b8ffe0d 100644 (file)
--- 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 44d5f7ca5cc0536d300ade1ad3a4ab0c095c4342..40bfd34b8c36531100c2ea02b60ba457a9adf1c0 100644 (file)
--- 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 d249e6d11a47178f7a40e7e942849a7d26483ff0..e0aec151f7c94222f422ccdf36f289a2a2e49301 100644 (file)
--- 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 d467e59f6247bf17a6be06df32c0c7e6566a0221..874c29016e8c39ed3e62b1b737ba2a372ebc71f3 100644 (file)
--- 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 381a44e6509ba283fb9dca41cb7b6d2d7b612a47..1b0670ab2681e5c162784300809d2d71a3d174a0 100644 (file)
--- 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 a34e35025fea8f13abc32873f2283a1359d7cb47..ce75451cd11648def317a49d56c34e5fb95b2227 100644 (file)
--- 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 159648f8677cca317a3f49a674f557845d31cebb..4f64ce1938f7f7129508e3b4bc85fa7967336fdd 100644 (file)
--- 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 e84ff302412f1812edba23f7febbf66bee5cb280..52355ffe228f990d6e2095cb7b3fa21bc9d20ccf 100644 (file)
--- 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 347b0b30bb1d91e5add45176c38cf3da0b599465..a7f28c70f5684367ec7821d29b31ba27d22d5d54 100644 (file)
--- 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 80bf7a9d222b18ea4eb224f2f0302ba83a916746..7e1a5db58805acc9fc4d1f7317b56e7690f45f00 100644 (file)
--- 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 b808f8425b807b72460afbbd2574972410a8fbf5..40a92fe05412ab07a0f9e5dd5b1f5ad69cfa27b3 100644 (file)
--- 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 d3c8c42622ad479e92142c2652c1c4a350626f6c..d9f43531a6b740acb2652cb71d33831c9301804b 100644 (file)
--- 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 d4b51a9c7a1e28de002ca7d9dec2fe7fd137787e..73c240f13b02e4b1d98007834c318d762b2b83e9 100644 (file)
--- 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 1b44a874283ef5c1c538c108ba1be9ab3d04e355..52823994de89103f3c46a5f00bad2068d7d0046b 100644 (file)
--- 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 69b8f59c310d7c3ac6630bb4c15dbc83c2b2d540..9439b9e8591e5d59b93236afd9aa46e6881a1c90 100644 (file)
--- 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 c8a14aef80ad60aeea8d613b31fad9d044794a5c..fee75df97c64743c48354b3f77f732fb754f96c1 100644 (file)
--- 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 e1e225dc25f5a8a9a30ee5438842fde3b7ecb3cb..d97c38e3b62c77d4be0e1c0d5af4363ad67c99eb 100644 (file)
--- 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 94aaaf3c536780afbfc18f41b90c30b923fe302a..def1e49900f8eceeb6412c2da2c03b96fe7157d3 100644 (file)
--- 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 d9997d24aa7c8eaace5944cb731a558039484634..231f0e7ac5e340528dfd53b945746010baba5bd5 100644 (file)
--- 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 dfe6cfb39ecadfccdc18f4896bc020abeaff87bd..59a8174419b49bda2399d852db45e5d24945ad1a 100644 (file)
--- 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 8facb8a52aa91811941269a1662669e740bcd457..4afd3fb9a93a75eaeaa49adfcefaec09c30bc84b 100644 (file)
--- 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 874b3dfa27fc765e522cf1ea1a95d93f4b7696c6..24bfcda1170046ea464a09519f175b7eeeaff4cf 100644 (file)
--- 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 9b38e1eaaa6f7b100905edaf82576b50ec6bc69b..b4f85be8c4d5d538f64dca740d7b29de63ff9edf 100644 (file)
--- 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 c6546f1781ddfe2c618840a1f11f32df5c4f665b..446cadc2915588d4f0e38fe16ed8e486a02fa38f 100644 (file)
--- 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 8ad5e84e168fd20207f1ae86487c6b9f18d9c936..27d75aa6dc54ca1096f0bbcd1abcd73d9aa99d0b 100644 (file)
--- 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 21bcf31cd6083b6de7d5934dc98300201e36b1cb..516dcc8a1c52bab0a0b3b645584db07fd5731613 100644 (file)
--- 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 4e9cd939368e0a8882340c248942ae212cf6c979..14b68bdd0ca86b652634b394b28487e5ea541b53 100644 (file)
--- 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 4139d3598535841226c3072fd6ad623af83b906c..0a5a3767f3edc41d9ec022b00878240dd7c30930 100644 (file)
--- 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 0cbfda07699e12c8103c1ab9fff970959c54dc60..4c2d1ec98464d651a2966770acaac27e3547d73c 100644 (file)
--- 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" }