gdb:

	* configure.host (xscale*): Don't handle target.
	* configure.tgt (thumb*-*-* | strongarm*-*-* | xscale-*-*): Don't
	handle targets.

gdb/gdbserver:
	* README: Don't mention xscale*-*-linux*.
	* configure.srv (xscale*-*-linux*): Don't handle target.

gdb/testsuite:
	* gdb.base/a2-run.exp (strongarm-*-coff): Don't handle target.
	* gdb.base/float.exp (xscale*-*-*, strongarm*-*-*): Don't handle
	targets.
	* gdb.base/long_long.exp (xscale*-*-*, strongarm*-*-*): Don't
	handle targets.

sim:
	* configure.tgt (thumb*-*-* | strongarm*-*-* | xscale-*-*): Don't
	handle targets.
	* configure: Regenerate.

sim/testsuite:
	* configure: Regenerate.
	* sim/arm/allinsn.exp (xscale*-*-*): Don't handle target.
	* sim/arm/misc.exp (thumb*-*-*, xscale*-*-*): Don't handle
	targets.
	* sim/arm/iwmmxt/iwmmxt.exp: Test for arm*-*-* instead of
	xscale*-*-*.
	* sim/arm/thumb/allthumb.exp (thumb*-*-*): Don't handle target.
	* sim/arm/xscale/xscale.exp: Test for arm*-*-* instead of
	xscale*-*-*.

10 files changed, 29 insertions, 9 deletions

diff --git a/sim/ChangeLog b/sim/ChangeLog
index 7227992..02b05e1 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt (thumb*-*-* | strongarm*-*-* | xscale-*-*): Don't
+	handle targets.
+	* configure: Regenerate.
+
 2011-03-05  Mike Frysinger  <vapier@gentoo.org>
 
 	* MAINTAINERS: Add bfin entry.
diff --git a/sim/configure b/sim/configure
index b3d8b39..1cf0231 100755
--- a/sim/configure
+++ b/sim/configure
@@ -3623,7 +3623,7 @@ sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
-   arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+   arm*-*-*)
 
   sim_arch=arm
 
diff --git a/sim/configure.tgt b/sim/configure.tgt
index 9808492..bc34323 100644
--- a/sim/configure.tgt
+++ b/sim/configure.tgt
@@ -16,7 +16,7 @@ sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
-   arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+   arm*-*-*)
        SIM_ARCH(arm)
        sim_testsuite=yes
        ;;
diff --git a/sim/testsuite/ChangeLog b/sim/testsuite/ChangeLog
index 9a94cc5..f902b4a 100644
--- a/sim/testsuite/ChangeLog
+++ b/sim/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure: Regenerate.
+	* sim/arm/allinsn.exp (xscale*-*-*): Don't handle target.
+	* sim/arm/misc.exp (thumb*-*-*, xscale*-*-*): Don't handle
+	targets.
+	* sim/arm/iwmmxt/iwmmxt.exp: Test for arm*-*-* instead of
+	xscale*-*-*.
+	* sim/arm/thumb/allthumb.exp (thumb*-*-*): Don't handle target.
+	* sim/arm/xscale/xscale.exp: Test for arm*-*-* instead of
+	xscale*-*-*.
+
 2010-10-07  Hans-Peter Nilsson  <hp@axis.com>
 
 	* sim/cris/c/seek3.c, sim/cris/c/seek4.c: New tests.
diff --git a/sim/testsuite/configure b/sim/testsuite/configure
index da7967e..3f89000 100755
--- a/sim/testsuite/configure
+++ b/sim/testsuite/configure
@@ -1823,13 +1823,16 @@ sim_common=yes
 sim_igen=no
 sim_arch=
 case "${target}" in
-   arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+   arm*-*-*)
        sim_arch=arm
        sim_testsuite=yes
        ;;
    avr*-*-*)
        sim_arch=avr
        ;;
+   bfin-*-*)
+       sim_arch=bfin
+       ;;
    cr16*-*-*)
        sim_arch=cr16
        sim_testsuite=yes
diff --git a/sim/testsuite/sim/arm/allinsn.exp b/sim/testsuite/sim/arm/allinsn.exp
index ec8402f..9752da6 100644
--- a/sim/testsuite/sim/arm/allinsn.exp
+++ b/sim/testsuite/sim/arm/allinsn.exp
@@ -1,6 +1,6 @@
 # ARM simulator testsuite.
 
-if { [istarget arm*-*-*] || [istarget xscale*-*-*] } {
+if { [istarget arm*-*-*] } {
     # load support procs (none yet)
     # load_lib cgen.exp
 
diff --git a/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp b/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
index f3d0f0a..4def690 100644
--- a/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
+++ b/sim/testsuite/sim/arm/iwmmxt/iwmmxt.exp
@@ -1,6 +1,6 @@
 # Intel(r) Wireless MMX(tm) technology simulator testsuite.
 
-if { [istarget xscale*-*-*] } {
+if { [istarget arm*-*-*] } {
     # load support procs (none yet)
     # load_lib cgen.exp
 
diff --git a/sim/testsuite/sim/arm/misc.exp b/sim/testsuite/sim/arm/misc.exp
index 1e8006f..bc36ca8 100644
--- a/sim/testsuite/sim/arm/misc.exp
+++ b/sim/testsuite/sim/arm/misc.exp
@@ -1,6 +1,6 @@
 # Miscellaneous ARM simulator testcases
 
-if { [istarget arm*-*-*] || [istarget thumb*-*-*] || [istarget xscale*-*-*] } {
+if { [istarget arm*-*-*] } {
     # load support procs
     # load_lib cgen.exp
 
diff --git a/sim/testsuite/sim/arm/thumb/allthumb.exp b/sim/testsuite/sim/arm/thumb/allthumb.exp
index 9674bca..4298663 100644
--- a/sim/testsuite/sim/arm/thumb/allthumb.exp
+++ b/sim/testsuite/sim/arm/thumb/allthumb.exp
@@ -1,7 +1,6 @@
 # ARM simulator testsuite.
 
-if { [istarget arm*-*-*]
-     || [istarget thumb*-*-*] } {
+if { [istarget arm*-*-*] } {
     # load support procs (none yet)
     # load_lib cgen.exp
 
diff --git a/sim/testsuite/sim/arm/xscale/xscale.exp b/sim/testsuite/sim/arm/xscale/xscale.exp
index 3756929..7c08f11 100644
--- a/sim/testsuite/sim/arm/xscale/xscale.exp
+++ b/sim/testsuite/sim/arm/xscale/xscale.exp
@@ -1,6 +1,6 @@
 # XSCALE simulator testsuite.
 
-if { [istarget xscale*-*-*] } {
+if { [istarget arm*-*-*] } {
     # load support procs (none yet)
     # load_lib cgen.exp