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*-*-*.

20 files changed, 54 insertions, 26 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9e1cc66..60e5ff3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.host (xscale*): Don't handle target.
+	* configure.tgt (thumb*-*-* | strongarm*-*-* | xscale-*-*): Don't
+	handle targets.
+
 2011-05-04  Yao Qi  <yao@codesourcery.com>
 
 	* gdb_wait.h: remove WAITTYPE and WCOREDUMP.
diff --git a/gdb/configure.host b/gdb/configure.host
index bcebdaf..531f4587c 100644
--- a/gdb/configure.host
+++ b/gdb/configure.host
@@ -51,7 +51,6 @@ sparcv9 | sparc64)	gdb_host_cpu=sparc ;;
 s390*)			gdb_host_cpu=s390 ;;
 sh*)			gdb_host_cpu=sh ;;
 x86_64*)		gdb_host_cpu=i386 ;;
-xscale*)		gdb_host_cpu=arm ;;
 m32r*)			gdb_host_cpu=m32r ;;
 xtensa*)		gdb_host_cpu=xtensa ;;
 *)			gdb_host_cpu=$host_cpu ;;
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 5ab1554..eb05c26 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -94,7 +94,7 @@ arm*-*-symbianelf*)
 	# Target: SymbianOS/arm
 	gdb_target_obs="arm-tdep.o solib-target.o arm-symbian-tdep.o"
 	;;
-arm*-*-* | thumb*-*-* | strongarm*-*-* | xscale-*-*)
+arm*-*-*)
 	# Target: ARM embedded system
 	gdb_target_obs="arm-tdep.o"
 	gdb_sim=../sim/arm/libsim.a
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index fd01327..42b30a4 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* README: Don't mention xscale*-*-linux*.
+	* configure.srv (xscale*-*-linux*): Don't handle target.
+
 2011-04-27  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* linux-x86-low.c (amd64_emit_const): Call memcpy instead of
diff --git a/gdb/gdbserver/README b/gdb/gdbserver/README
index 3eaeb61..52a876b 100644
--- a/gdb/gdbserver/README
+++ b/gdb/gdbserver/README
@@ -99,7 +99,6 @@ The supported targets as of November 2006 are:
 	sh-*-linux*
 	spu*-*-*
 	x86_64-*-linux*
-	xscale*-*-linux*
 
 Configuring GDBserver you should specify the same machine for host and
 target (which are the machine that GDBserver is going to run on.  This
diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv
index d6110dd..55dd4cf 100644
--- a/gdb/gdbserver/configure.srv
+++ b/gdb/gdbserver/configure.srv
@@ -257,11 +257,6 @@ case "${target}" in
 			srv_mingw=yes
 			;;
 
-  xscale*-*-linux*)	srv_regobj=reg-arm.o
-			srv_tgtobj="linux-low.o linux-arm-low.o"
-			srv_linux_usrregs=yes
-			srv_linux_thread_db=yes
-			;;
   xtensa*-*-linux*)	srv_regobj=reg-xtensa.o
 			srv_tgtobj="linux-low.o linux-xtensa-low.o"
 			srv_linux_regsets=yes
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0e5405d..178cd5d 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-04  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2011-05-04  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
 	* gdb.base/completion.exp (complete help info wat): Rename to ...
diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index cb1e6fd..2ba2d8a 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -111,7 +111,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-	setup_xfail "mips-idt-*" "arm-*-coff strongarm-*-coff"
+	setup_xfail "mips-idt-*" "arm-*-coff"
 	gdb_run_cmd 5
 	gdb_expect {
 	    -re ".*120.*$gdb_prompt $"\
@@ -139,7 +139,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-    setup_xfail "arm-*-coff strongarm-*-coff"
+    setup_xfail "arm-*-coff"
     gdb_expect {
 	    -re ".*120.*$gdb_prompt $"\
 				{ pass "run \"$testfile\" again with same args" }
@@ -216,7 +216,7 @@ if [istarget "*-*-vxworks*"] then {
     verbose "Timeout is now $timeout seconds" 2
     gdb_expect -re "$gdb_prompt $" {}
 } else {
-    setup_xfail "arm-*-coff strongarm-*-coff"
+    setup_xfail "arm-*-coff"
     gdb_expect {
 	    -re ".*720.*$gdb_prompt $" {
 		pass "run \"$testfile\" again after setting args"
diff --git a/gdb/testsuite/gdb.base/float.exp b/gdb/testsuite/gdb.base/float.exp
index 83be8d9..170ba77 100644
--- a/gdb/testsuite/gdb.base/float.exp
+++ b/gdb/testsuite/gdb.base/float.exp
@@ -42,9 +42,7 @@ if ![runto_main] then {
 
 if { [istarget "alpha*-*-*"] } then {
     gdb_test "info float" "f0.*" "info float"
-} elseif { [istarget "arm*-*-*"] || \
-	[istarget "xscale*-*-*"] || \
-	[istarget "strongarm*-*-*"] } then {
+} elseif { [istarget "arm*-*-*"] } then {
     gdb_test_multiple "info float" "info float" {
 	-re "Software FPU type.*mask:.*flags:.*$gdb_prompt $" {
 	    pass "info float (FPA)"
diff --git a/gdb/testsuite/gdb.base/long_long.exp b/gdb/testsuite/gdb.base/long_long.exp
index baa76b6..9162f6a 100644
--- a/gdb/testsuite/gdb.base/long_long.exp
+++ b/gdb/testsuite/gdb.base/long_long.exp
@@ -165,9 +165,7 @@ if { $sizeof_double == 8 || $sizeof_long_double == 8 } {
     # words swapped in big endian format.
     # EABI targets default to natural-endian VFP format.
 
-    if { ([istarget "arm*-*-*"] || \
-	  [istarget "xscale*-*-*"] || \
-	  [istarget "strongarm*-*-*"]) \
+    if { ([istarget "arm*-*-*"]) \
 	 && !([istarget "*-*-*eabi"] || \
 	      [istarget "*-*-mingw32ce*"] || \
 	      [istarget "*-*-openbsd*"] || \
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