diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index b1eb44e7c2..baa8315885 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,16 @@
+2002-05-20  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* gas/arm/arm.exp: Replace deprecated command line switches
+	with their modern equivalents.
+	* gas/arm/arm7t.d: As above.
+	* gas/arm/armv1.d: As above.
+	* gas/arm/fpa-dyadic.d: As above.
+	* gas/arm/fpa-mem.d: As above.
+	* gas/arm/fpa-monadic.d: As above.
+	* gas/arm/inst.d: As above.
+	* gas/arm/ldconst.d: As above.
+	* gas/arm/xscale.d: As above.
+
 2002-05-13  Alan Modra  <amodra@bigpond.net.au>
 
 	* gas/i386/x86-64-opcode.s: Pad out end of .text with zeros.
diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
index 0f6d8f0d9d..3d0647871d 100644
--- a/gas/testsuite/gas/arm/arm.exp
+++ b/gas/testsuite/gas/arm/arm.exp
@@ -21,19 +21,19 @@ if {[istarget *arm*-*-*] || [istarget "xscale-*-*"]} then {
 
     run_dump_test "armv1"
 
-    run_errors_test "armv1-bad" "-marm1" "ARM v1 errors"
+    run_errors_test "armv1-bad" "-mcpu=arm7m" "ARM v1 errors"
 
-    gas_test "arm3.s" "-marm3" $stdoptlist "Arm 3 instructions"
+    gas_test "arm3.s" "-mcpu=arm3" $stdoptlist "Arm 3 instructions"
 
-    gas_test "arm6.s" "-marm6" $stdoptlist "Arm 6 instructions"
+    gas_test "arm6.s" "-mcpu=arm6" $stdoptlist "Arm 6 instructions"
 
-    gas_test "arm7dm.s" "-marm7dm" $stdoptlist "Arm 7DM instructions"
+    gas_test "arm7dm.s" "-mcpu=arm7dm" $stdoptlist "Arm 7DM instructions"
 
     run_dump_test "arm7t"
 
-    gas_test "thumb.s" "-marm7t" $stdoptlist "Thumb instructions"
+    gas_test "thumb.s" "-mcpu=arm7t" $stdoptlist "Thumb instructions"
 
-    gas_test "arch4t.s" "-marmv4t" $stdoptlist "Arm architecture 4t instructions"
+    gas_test "arch4t.s" "-march=armv4t" $stdoptlist "Arm architecture 4t instructions"
 
     run_dump_test "arch5tej"
 
diff --git a/gas/testsuite/gas/arm/arm7t.d b/gas/testsuite/gas/arm/arm7t.d
index 87b388f5e6..857a9b57cf 100644
--- a/gas/testsuite/gas/arm/arm7t.d
+++ b/gas/testsuite/gas/arm/arm7t.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM arm7t
-#as: -marm7t -EL
+#as: -mcpu=arm7t -EL
 
 # Test the halfword and signextend memory transfers:
 
diff --git a/gas/testsuite/gas/arm/armv1.d b/gas/testsuite/gas/arm/armv1.d
index d4e5fd17dd..443264079e 100644
--- a/gas/testsuite/gas/arm/armv1.d
+++ b/gas/testsuite/gas/arm/armv1.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM v1 instructions
-#as: -marm1
+#as: -mcpu=arm7t
 
 # Test the ARM v1 instructions
 
diff --git a/gas/testsuite/gas/arm/fpa-dyadic.d b/gas/testsuite/gas/arm/fpa-dyadic.d
index 1eebe91da6..f603bbff84 100644
--- a/gas/testsuite/gas/arm/fpa-dyadic.d
+++ b/gas/testsuite/gas/arm/fpa-dyadic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: FPA Dyadic instructions
-#as: -mfpe-old
+#as: -mfpu=fpa -mcpu=arm7m
 
 # Test FPA Dyadic instructions
 # This test should work for both big and little-endian assembly.
diff --git a/gas/testsuite/gas/arm/fpa-mem.d b/gas/testsuite/gas/arm/fpa-mem.d
index 68f4541f12..12ee585708 100644
--- a/gas/testsuite/gas/arm/fpa-mem.d
+++ b/gas/testsuite/gas/arm/fpa-mem.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: FPA memory insructions
-#as: -mfpa10
+#as: -mfpu=fpa10 -mcpu=arm7m
 
 # Test FPA memory instructions
 # This test should work for both big and little-endian assembly.
diff --git a/gas/testsuite/gas/arm/fpa-monadic.d b/gas/testsuite/gas/arm/fpa-monadic.d
index 9bb1d248f5..a688ee4be6 100644
--- a/gas/testsuite/gas/arm/fpa-monadic.d
+++ b/gas/testsuite/gas/arm/fpa-monadic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: FPA Monadic instructions
-#as: -mfpe-old
+#as: -mfpu=fpa -mcpu=arm7m
 
 # Test FPA Monadic instructions
 # This test should work for both big and little-endian assembly.
diff --git a/gas/testsuite/gas/arm/inst.d b/gas/testsuite/gas/arm/inst.d
index 1281e9caae..1495d8978b 100644
--- a/gas/testsuite/gas/arm/inst.d
+++ b/gas/testsuite/gas/arm/inst.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM basic instructions
-#as: -marm2 -EL
+#as: -mcpu=arm7m -EL
 
 # Test the standard ARM instructions:
 
diff --git a/gas/testsuite/gas/arm/ldconst.d b/gas/testsuite/gas/arm/ldconst.d
index c7d2837283..6ce123d2ed 100644
--- a/gas/testsuite/gas/arm/ldconst.d
+++ b/gas/testsuite/gas/arm/ldconst.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: ARM ldr with immediate constant
-#as: -marm2 -EL
+#as: -mcpu=arm7m -EL
 
 .*: +file format .*arm.*
 
diff --git a/gas/testsuite/gas/arm/xscale.d b/gas/testsuite/gas/arm/xscale.d
index d1ec7322cd..bd4e06af09 100644
--- a/gas/testsuite/gas/arm/xscale.d
+++ b/gas/testsuite/gas/arm/xscale.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: XScale instructions
-#as: -mxscale -EL
+#as: -mcpu=xscale -EL
 
 # Test the XScale instructions: