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, 33 insertions, 40 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a63c961101..54ed744641 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2011-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* configure.tgt: Add elf_l1om to targ_extra_libpath for
diff --git a/ld/configure.tgt b/ld/configure.tgt
index e1430c7f2c..713013d5a4 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -97,18 +97,6 @@ arm*-*-uclinux*)	targ_emul=armelf_linux
 			;;
 arm-*-vxworks)		targ_emul=armelf_vxworks ;;
 arm*-*-conix*)		targ_emul=armelf ;;
-thumb-*-linux-* | thumb-*-uclinux*)	targ_emul=armelf_linux; targ_extra_emuls=armelf ;;
-strongarm-*-coff)	targ_emul=armcoff ;;
-strongarm-*-elf)	targ_emul=armelf ;;
-strongarm-*-kaos*)	targ_emul=armelf ;;
-thumb-*-coff)		targ_emul=armcoff ;;
-thumb-*-elf)		targ_emul=armelf ;;
-thumb-epoc-pe)		targ_emul=arm_epoc_pe ;
-			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
-thumb-*-pe)		targ_emul=armpe ;
-			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
-xscale-*-coff)		targ_emul=armcoff ;;
-xscale-*-elf)		targ_emul=armelf
 			;;
 avr-*-*)		targ_emul=avr2
 			targ_extra_emuls="avr1 avr25 avr3 avr31 avr35 avr4 avr5 avr51 avr6 avrxmega1 avrxmega2 avrxmega3 avrxmega4 avrxmega5 avrxmega6 avrxmega7"
diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index ddbb461b7f..7c81bcb711 100644
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,17 @@
+2011-04-06  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2011-04-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/12627
diff --git a/ld/testsuite/ld-selective/selective.exp b/ld/testsuite/ld-selective/selective.exp
index 81870c2a05..505db65615 100644
--- a/ld/testsuite/ld-selective/selective.exp
+++ b/ld/testsuite/ld-selective/selective.exp
@@ -1,6 +1,6 @@
 # Expect script for LD selective linking tests
-#   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009
-#   Free Software Foundation, Inc.
+#   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009,
+#   2010, 2011 Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -139,7 +139,7 @@ foreach testitem $seltests {
     }
 
     # ARM targets need libgcc.a in THUMB mode so that __call_via_r3 is provided
-    if {[istarget arm-*-*] || [istarget xscale-*-*]} {
+    if {[istarget arm-*-*]} {
 	set libgcc [remote_exec host "$compiler -print-libgcc-file-name"]
 	set libgcc [lindex $libgcc 1]
 	regsub -all "\[\r\n\]" $libgcc "" libgcc
diff --git a/ld/testsuite/ld-srec/srec.exp b/ld/testsuite/ld-srec/srec.exp
index cb01f3f8d9..305102668f 100644
--- a/ld/testsuite/ld-srec/srec.exp
+++ b/ld/testsuite/ld-srec/srec.exp
@@ -1,6 +1,6 @@
 # Test linking directly to S-records.
 # By Ian Lance Taylor, Cygnus Support.
-#   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009
+#   Copyright 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2011
 #   Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
@@ -250,15 +250,10 @@ proc run_srec_test { test objs } {
 	setup_xfail "sh64*-*-*"
     }
 
-    if {[istarget arm*-*-*]       || \
-        [istarget strongarm*-*-*] || \
-        [istarget xscale*-*-*]    || \
-        [istarget thumb-*-*] } {
+    if {[istarget arm*-*-*]} {
         # ARM targets cannot convert format in the linker 
         # using the --oformat command line switch
-	setup_xfail "*arm*-*-*"
-	setup_xfail "xscale-*-*"
-	setup_xfail "thumb-*-*"
+	setup_xfail "arm*-*-*"
     }
 
     # V850 targets need libgcc.a
@@ -342,13 +337,8 @@ setup_xfail "*-*-aix*" "*-*-xcoff*"
 
 # The S-record linker doesn't build ARM/Thumb stubs.
 setup_xfail "arm-*-coff"
-setup_xfail "strongarm*-*-coff"
-setup_xfail "xscale*-*-coff"
 setup_xfail "arm-*-pe*"
 # setup_xfail "arm-*elf*"
-setup_xfail "thumb-*-coff*"
-setup_xfail "thumb-*-pe*"
-setup_xfail "thumb-*-elf*"
 setup_xfail "arm*-*-linux*"
 
 # The S-record linker doesn't include the .{zda} sections.
@@ -395,8 +385,6 @@ setup_xfail "i*86-*-aout*"
 setup_xfail "mips*-*-irix5*" "mips*-*-irix6*" "mips*-*-linux*"
 setup_xfail "*-*-aix*" "*-*-xcoff*"
 setup_xfail "arm*-*-*"
-setup_xfail "strongarm*-*-*"
-setup_xfail "thumb-*-*"
 setup_xfail "v850*-*-elf"
 setup_xfail "alpha*-*-elf*" "alpha*-*-linux-*" "alpha*-*-gnu*"
 setup_xfail "alpha*-*-netbsd*"
diff --git a/ld/testsuite/ld-undefined/undefined.exp b/ld/testsuite/ld-undefined/undefined.exp
index 29273515e1..65fbc4b4d7 100644
--- a/ld/testsuite/ld-undefined/undefined.exp
+++ b/ld/testsuite/ld-undefined/undefined.exp
@@ -2,7 +2,7 @@
 # By Ian Lance Taylor, Cygnus Support
 #
 #   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2007, 2008  Free Software Foundation, Inc.
+#   2005, 2007, 2008, 2010, 2011  Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -69,7 +69,6 @@ checkund $mu $testund
 # ARM PE defaults to using stabs debugging, which we can't handle for
 # a COFF file.
 #setup_xfail "arm*-*-pe*"
-#setup_xfail "thumb*-*-pe*"
 
 # For Xtensa on GNU Linux systems (or any other system where PIC code is
 # always used), the address of the undefined function is in a literal pool
@@ -89,12 +88,11 @@ if ![is_elf_format] {
     # ARM PE defaults to using stabs debugging, which we can't handle for
     # a COFF file.
     #setup_xfail "arm*-*-pe*"
-    #setup_xfail "thumb*-*-pe*"
 }
 
 set ml "undefined.c:9: undefined reference to `*this_function_is_not_defined'"
-# With targets that use elf/dwarf2, such as the arm-elf and thumb-elf
-# toolchains, the code in bfd/elf.c:_bfd_elf_find_nearest_line() is called
+# With targets that use elf/dwarf2, such as the arm-elf
+# toolchain, the code in bfd/elf.c:_bfd_elf_find_nearest_line() is called
 # in order to locate the file name/line number where the undefined
 # reference occurs.  Unfortunately this tries to use the dwarf2 debug
 # information held in the .debug_info section.  This section contains a series
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp
index 48e9635d03..0591e8b6eb 100644
--- a/ld/testsuite/lib/ld-lib.exp
+++ b/ld/testsuite/lib/ld-lib.exp
@@ -1,6 +1,7 @@
 # Support routines for LD testsuite.
 #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#    2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+#    2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+#    Free Software Foundation, Inc.
 #
 # This file is part of the GNU Binutils.
 #
@@ -369,10 +370,7 @@ proc ld_simple_link_defsyms {} {
     set flags "--defsym __stack_chk_fail=0"
 
     # ARM targets call __gccmain
-    if {[istarget arm*-*-*]       || \
-        [istarget strongarm*-*-*] || \
-        [istarget xscale*-*-*]    || \
-        [istarget thumb-*-*] } {
+    if {[istarget arm*-*-*]} {
         append flags " --defsym __gccmain=0"
     }