diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 34c4a23b40..ff75483895 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-08  Michael Snyder  <msnyder@redhat.com>
+
+	* gdb.base/long_long.exp: Merge clauses for arm and xscale.
+	* gdb.base/default.exp: Merge clauses for arm, strongarm, xscale.
+
 2002-05-06  Michael Snyder  <msnyder@redhat.com>
 
 	* lib/gdb.exp (gdb_test): Add case to allow for status wrapper.
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 09b65a9148..ea8ba503c6 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -320,13 +320,9 @@ gdb_test "info frame" "No stack.|No selected frame." "info frame"
 #test info files
 gdb_test "info files" "" "info files"
 #test info float
-if [istarget "arm*-*-*"] then {
-    gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
-} elseif [istarget "xscale*-*-*"] then {
-    gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
-} elseif [istarget "thumb*-*-*"] then {
-    gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
-} elseif [istarget "strongarm*-*-*"] then {
+if { [istarget "arm*-*-*"] || \
+	[istarget "xscale*-*-*"] || \
+	[istarget "strongarm*-*-*"] } then {
     gdb_test "info float" "Software FPU type.*mask:.*flags:.*" "info float"
 } elseif [istarget "i\[3456\]86-*-*"] then {
     gdb_test "info float" "R7:.*Status Word:.*Opcode:.*" "info float"
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index 016b0e67f6..182f049cff 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -152,23 +152,14 @@ if { $sizeof_double == 8 } {
 # but a hybrid.  They are in little endian format with the two words
 # swapped in big endian format.
 
-  if [ istarget "arm*-*-*" ] then {
-
-#   assume the long long represents a floating point double in ARM format
-     gdb_test "p/f oct" ".*2.1386676354387559e\\+265.*"
-
-  } elseif [ istarget "xscale*-*-*" ] then {
-
-#   assume the long long represents a floating point double in ARM format
-     gdb_test "p/f oct" ".*2.1386676354387559e\\+265.*"
-
-  } else {
-
-#   assume the long long represents a floating point double in little
-#   endian format
-    gdb_test "p/f oct" ".*-5.9822653797615723e-120.*"
-
-  }
+    if { [istarget "arm*-*-*"] || [istarget "xscale*-*-*"] } then {
+	# assume the long long represents a floating point double in ARM format
+	gdb_test "p/f oct" ".*2.1386676354387559e\\+265.*"
+    } else {
+	# assume the long long represents a floating point double in little
+	# endian format
+	gdb_test "p/f oct" ".*-5.9822653797615723e-120.*"
+    }
 
 } else {