bfd:

	* config.bfd (thumb-*-oabi): Don't handle in list of obsolete
	targets.
	(strongarm*, thumb*, xscale*): Remove architectures.
	(strongarm-*-kaos*, thumb-*-coff, thumb-*-elf, thumb-epoc-pe*,
	thumb-*-pe*, strongarm-*-elf, strongarm-*-coff, xscale-*-elf,
	xscale-*-coff): Remove targets.

binutils:
	* configure.in (thumb-*-pe*): Remove.
	* configure: Regenerate.

binutils/testsuite:
	* binutils-all/objcopy.exp (*arm*-*-coff): Change to arm*-*-coff.
	(xscale-*-coff, thumb*-*-coff, thumb*-*-pe): Don't handle.

gas:
	* configure.tgt (strongarm*be, strongarm*b, strongarm*,
	xscale*be|xscale*b, xscale*): Remove architectures.
	(thumb-*-coff, thumb-*-rtems*, thumb-*-elf, thumb-epoc-pe,
	thumb-*-pe, xscale-*-coff, xscale-*-elf): Remove targets.

gas/testsuite:
	* gas/all/gas.exp (*arm*-*-coff): Change to arm*-*-coff.
	(thumb*-*-coff, thumb*-*-pe*): Don;t handle.
	* gas/arm/arm.exp (*arm*-*-*): Change to arm*-*-*.
	(*xscale*-*-*): Don't handle.
	* gas/cfi/cfi.exp (xscale*-*): Don't handle.
	* gas/elf/elf.exp (*arm*-*-*): Change to arm*-*-*.
	(xscale*-*-*): Don't handle.

ld:
	* configure.tgt (thumb-*-linux-* | thumb-*-uclinux*,
	strongarm-*-coff, strongarm-*-elf, strongarm-*-kaos*,
	thumb-*-coff, thumb-*-elf, thumb-epoc-pe, thumb-*-pe,
	xscale-*-coff, xscale-*-elf): Remove targets.

ld/testsuite:
	* ld-selective/selective.exp (xscale-*-*): Don't handle.
	* ld-srec/srec.exp (strongarm*-*-*, xscale*-*-*, thumb-*-*): Don't
	handle.
	(*arm*-*-*): Change to arm*-*-*.
	(strongarm*-*-coff, xscale*-*-coff, thumb-*-coff*, thumb-*-pe*,
	thumb-*-elf*, strongarm*-*-*, thumb-*-*): Remove xfails.
	* ld-undefined/undefined.exp (thumb*-*-pe*, thumb*-*-pe*): Remove
	commented-out xfails.
	(thumb-elf): Remove reference in comment.
	* lib/ld-lib.exp (strongarm*-*-*, xscale*-*-*, thumb-*-*): Don't
	handle.

7 files changed, 28 insertions, 21 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3eaa376..90f8d7f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.tgt (strongarm*be, strongarm*b, strongarm*,
+	xscale*be|xscale*b, xscale*): Remove architectures.
+	(thumb-*-coff, thumb-*-rtems*, thumb-*-elf, thumb-epoc-pe,
+	thumb-*-pe, xscale-*-coff, xscale-*-elf): Remove targets.
+
 2011-04-01  Tristan Gingold  <gingold@adacore.com>
 
 	* config/tc-ia64.c (md_apply_fix): Add a cast to avoid a warning.
diff --git a/gas/configure.tgt b/gas/configure.tgt
index a01ff6c..d3b338c 100644
--- a/gas/configure.tgt
+++ b/gas/configure.tgt
@@ -80,13 +80,8 @@ case ${cpu} in
   sparclet*)		cpu_type=sparc arch=sparclet ;;
   sparclite*)		cpu_type=sparc arch=sparclite ;;
   sparc*)		cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c.
-  strongarm*be)		cpu_type=arm endian=big ;;
-  strongarm*b)		cpu_type=arm endian=big ;;
-  strongarm*)		cpu_type=arm endian=little ;;
   v850*)		cpu_type=v850 ;;
   x86_64*)		cpu_type=i386 arch=x86_64;;
-  xscale*be|xscale*b)	cpu_type=arm endian=big ;;
-  xscale*)		cpu_type=arm endian=little ;;
   xtensa*)		cpu_type=xtensa arch=xtensa ;;
   *)			cpu_type=${cpu} ;;
 esac
@@ -106,9 +101,9 @@ case ${generic_target} in
   arc-*-elf*)				fmt=elf ;;
 
   arm-*-aout)				fmt=aout ;;
-  arm-*-coff | thumb-*-coff)		fmt=coff ;;
-  arm-*-rtems* | thumb-*-rtems*)	fmt=elf ;;
-  arm-*-elf | thumb-*-elf)		fmt=elf ;;
+  arm-*-coff)				fmt=coff ;;
+  arm-*-rtems*)				fmt=elf ;;
+  arm-*-elf)				fmt=elf ;;
   arm-*-eabi*)				fmt=elf em=armeabi ;;
   arm-*-symbianelf*)			fmt=elf em=symbian ;;
   arm-*-kaos*)				fmt=elf ;;
@@ -121,10 +116,10 @@ case ${generic_target} in
   arm-*-netbsdelf*)			fmt=elf  em=nbsd ;;
   arm-*-*n*bsd*)			fmt=aout em=nbsd ;;
   arm-*-nto*)				fmt=elf ;;
-  arm-epoc-pe | thumb-epoc-pe)		fmt=coff em=epoc-pe ;;
+  arm-epoc-pe)				fmt=coff em=epoc-pe ;;
   arm-wince-pe | arm-*-wince | arm*-*-mingw32ce* | arm*-*-cegcc*)
 					fmt=coff em=wince-pe ;;
-  arm-*-pe | thumb-*-pe)		fmt=coff em=pe ;;
+  arm-*-pe)				fmt=coff em=pe ;;
   arm-*-riscix*)			fmt=aout em=riscix ;;
 
   avr-*-*)				fmt=elf bfd_gas=yes ;;
@@ -409,9 +404,6 @@ case ${generic_target} in
   vax-*-netbsdelf*)			fmt=elf em=nbsd ;;
   vax-*-linux-*)			fmt=elf em=linux ;;
 
-  xscale-*-coff)			fmt=coff ;;
-  xscale-*-elf)				fmt=elf ;;
-
   xstormy16-*-*)			fmt=elf ;;
 
   xtensa*-*-*)				fmt=elf ;;
diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 62fa86d..d77b730 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,13 @@
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* gas/all/gas.exp (*arm*-*-coff): Change to arm*-*-coff.
+	(thumb*-*-coff, thumb*-*-pe*): Don;t handle.
+	* gas/arm/arm.exp (*arm*-*-*): Change to arm*-*-*.
+	(*xscale*-*-*): Don't handle.
+	* gas/cfi/cfi.exp (xscale*-*): Don't handle.
+	* gas/elf/elf.exp (*arm*-*-*): Change to arm*-*-*.
+	(xscale*-*-*): Don't handle.
+
 2011-03-31  Bernd Schmidt  <bernds@codesourcery.com>
 
 	* gas/tic6x/scomm-directive-1.s: New test.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index f9330d9..70210c0 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -285,8 +285,8 @@ case $target_triplet in {
 # We omit the ARM toolchains because they define locals to
 #  start with '.', which eliminates .eos, .text etc from the output.
 # Omit c54x, since .tag and .def mean something different on that target
-if {   ([istarget *-*-coff*] && ![istarget *arm*-*-coff] && ![istarget thumb*-*-coff] && ![istarget xscale-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \
-     ||([istarget *-*-pe*] && ![istarget arm*-*-pe*] && ![istarget thumb*-*-pe*]) \
+if {   ([istarget *-*-coff*] && ![istarget arm*-*-coff] && ![istarget *c4x*-*-coff] && ![istarget *c54x*-*-coff]) \
+     ||([istarget *-*-pe*] && ![istarget arm*-*-pe*]) \
      || [istarget i*86-*-aix*] \
      || [istarget i*86-*-sco*] \
      || [istarget i*86-*-isc*] \
diff --git a/gas/testsuite/gas/arm/arm.exp b/gas/testsuite/gas/arm/arm.exp
index 56aef3b..9f494a3 100644
--- a/gas/testsuite/gas/arm/arm.exp
+++ b/gas/testsuite/gas/arm/arm.exp
@@ -2,6 +2,6 @@
 # Some ARM tests
 #
 
-if {[istarget *arm*-*-*] || [istarget *xscale*-*-*]} {
+if {[istarget arm*-*-*]} {
     run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 }
diff --git a/gas/testsuite/gas/cfi/cfi.exp b/gas/testsuite/gas/cfi/cfi.exp
index c5e3acf..dfe0cf5 100644
--- a/gas/testsuite/gas/cfi/cfi.exp
+++ b/gas/testsuite/gas/cfi/cfi.exp
@@ -72,7 +72,7 @@ if  { [istarget "i*86-*-*"] || [istarget "x86_64-*-*"] } then {
 	run_dump_test "cfi-sh-1"
     }
 
-} elseif { [istarget "arm*-*"] || [istarget "xscale*-*"] } then {
+} elseif { [istarget "arm*-*"] } then {
     # Only ELF based ARM targets support CFI.
     if { [is_pecoff_format] } then {
 	return
diff --git a/gas/testsuite/gas/elf/elf.exp b/gas/testsuite/gas/elf/elf.exp
index 8bfeb95..6eff0dd 100644
--- a/gas/testsuite/gas/elf/elf.exp
+++ b/gas/testsuite/gas/elf/elf.exp
@@ -69,8 +69,7 @@ if { ([istarget "*-*-*elf*"]
     if {[istarget "rx-*-*"]} then {
 	set target_machine -rx
     }
-    if { ([istarget "*arm*-*-*"]
-	  || [istarget "xscale*-*-*"]) } {
+    if {[istarget "arm*-*-*"]} {
 
 	if { ([istarget "*-*-*eabi"]
 	      || [istarget "*-*-linux-*"]
@@ -165,8 +164,7 @@ if { ([istarget "*-*-*elf*"]
     # So for these targets we cannot include an IFUNC symbol type
     # in the symbol type test.
     if {   [istarget "msp*-*-*"]
-	|| [istarget "arm*-*-*"]
-	|| [istarget "xscale*-*-*"]} then {
+	|| [istarget "arm*-*-*"]} then {
 	    run_elf_list_test "type-noifunc" "" "" "-s" "| grep \"1 *\\\[FONTC\\\]\""
     } else {
     	    run_dump_test ifunc-1