public inbox for binutils@sourceware.org
 help / color / mirror / Atom feed
* Remove code handling old ARM aliases
@ 2011-03-30 16:56 Joseph S. Myers
  2011-04-05 14:40 ` Ping " Joseph S. Myers
  2011-04-06 16:18 ` Richard Earnshaw
  0 siblings, 2 replies; 4+ messages in thread
From: Joseph S. Myers @ 2011-03-30 16:56 UTC (permalink / raw)
  To: binutils

There used to be various alternative target triplets for some ARM
targets such as strongarm*-*-*, thumb*-*-* and xscale*-*-*.  These are
now handled by config.sub as aliases for arm*-*-* (or in the case of
ep9312*-*-*, rejected outright by config.sub), so no code in configure
scripts or testsuites needs to allow for the old alternative names any
more; this patch removes code handling them from binutils.  (Matches
for *arm*-*-* presumably intended to match "strongarm"; where I
encountered these in the course of making these fixes I changed them
to arm*-*-*, but I didn't try to seek out all such cases
systematically.  It's quite possible some code matches arm-*-* without
the "*" after "arm", so missing some valid cases, but I didn't look
for such problems either.)  OK to commit?

bfd:
2011-03-30  Joseph Myers  <joseph@codesourcery.com>

	* 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:
2011-03-30  Joseph Myers  <joseph@codesourcery.com>

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

binutils/testsuite:
2011-03-30  Joseph Myers  <joseph@codesourcery.com>

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

gas:
2011-03-30  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.

gas/testsuite:
2011-03-30  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.

ld:
2011-03-30  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.

ld/testsuite:
2011-03-30  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.

Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.275
diff -u -r1.275 config.bfd
--- bfd/config.bfd	28 Mar 2011 11:18:25 -0000	1.275
+++ bfd/config.bfd	30 Mar 2011 16:36:46 -0000
@@ -53,7 +53,6 @@
  sparc-*-lynxos* | \
  vax-*-vms* | \
  arm-*-oabi | \
- thumb-*-oabi | \
  a29k-* | \
  hppa*-*-rtems* | \
  *-go32-rtems* | \
@@ -101,11 +100,8 @@
 sh*)		 targ_archs=bfd_sh_arch ;;
 sparc*)		 targ_archs=bfd_sparc_arch ;;
 spu*)            targ_archs=bfd_spu_arch ;;
-strongarm*)	 targ_archs=bfd_arm_arch ;;
-thumb*)		 targ_archs=bfd_arm_arch ;;
 v850*)		 targ_archs=bfd_v850_arch ;;
 x86_64*)	 targ_archs=bfd_i386_arch ;;
-xscale*)	 targ_archs=bfd_arm_arch ;;
 xtensa*)	 targ_archs=bfd_xtensa_arch ;;
 z80|r800)	 targ_archs=bfd_z80_arch ;;
 z8k*)		 targ_archs=bfd_z8k_arch ;;
@@ -275,7 +271,7 @@
     targ_defvec=bfd_elf32_bigarm_vec
     targ_selvecs=bfd_elf32_littlearm_vec
     ;;
-  arm-*-kaos* | strongarm-*-kaos*)
+  arm-*-kaos*)
     targ_defvec=bfd_elf32_littlearm_vec
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
@@ -298,44 +294,6 @@
     targ_selvecs=bfd_elf32_bigarm_vec
     ;;
 
-  thumb-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-  thumb-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  thumb-epoc-pe*)
-    targ_defvec=arm_epoc_pe_little_vec
-    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
-    targ_underscore=no
-    ;;
-  thumb-*-pe*)
-    targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
-    targ_underscore=yes
-    ;;
-  strongarm-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  strongarm-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-  xscale-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  xscale-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-
   avr-*-*)
     targ_defvec=bfd_elf32_avr_vec
     ;;
Index: binutils/configure
===================================================================
RCS file: /cvs/src/src/binutils/configure,v
retrieving revision 1.136
diff -u -r1.136 configure
--- binutils/configure	13 Feb 2011 21:00:11 -0000	1.136
+++ binutils/configure	30 Mar 2011 16:36:48 -0000
@@ -13846,15 +13846,6 @@
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
 	  ;;
-	thumb-*-pe*)
-  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-	  if test -z "$DLLTOOL_DEFAULT"; then
-	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
-	  fi
-	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
-	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-	  ;;
 	x86_64-*-mingw*)
   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
 	  if test -z "$DLLTOOL_DEFAULT"; then
Index: binutils/configure.in
===================================================================
RCS file: /cvs/src/src/binutils/configure.in,v
retrieving revision 1.100
diff -u -r1.100 configure.in
--- binutils/configure.in	22 Apr 2010 14:37:05 -0000	1.100
+++ binutils/configure.in	30 Mar 2011 16:36:48 -0000
@@ -248,15 +248,6 @@
 	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
 	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
 	  ;;
-	thumb-*-pe*)
-  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
-	  if test -z "$DLLTOOL_DEFAULT"; then
-	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
-	  fi
-	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
-	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
-	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
-	  ;;
 	x86_64-*-mingw*)
   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
 	  if test -z "$DLLTOOL_DEFAULT"; then
Index: binutils/testsuite/binutils-all/objcopy.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objcopy.exp,v
retrieving revision 1.71
diff -u -r1.71 objcopy.exp
--- binutils/testsuite/binutils-all/objcopy.exp	1 Jan 2011 01:56:59 -0000	1.71
+++ binutils/testsuite/binutils-all/objcopy.exp	30 Mar 2011 16:36:48 -0000
@@ -1,5 +1,5 @@
 #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2006, 2007, 2009, 2010
+#   2004, 2006, 2007, 2009, 2010, 2011
 #   Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -620,11 +620,8 @@
 	# mips_elf_sym_is_global.
 	setup_xfail "mips*-*-elf"
 
-	setup_xfail "*arm*-*-coff"
-	setup_xfail "xscale-*-coff"
+	setup_xfail "arm*-*-coff"
 	setup_xfail "arm*-*-pe"
-	setup_xfail "thumb*-*-coff"
-	setup_xfail "thumb*-*-pe"
 	setup_xfail "*-*-mingw*"
 	setup_xfail "*-*-cygwin*"
     
Index: gas/configure.tgt
===================================================================
RCS file: /cvs/src/src/gas/configure.tgt,v
retrieving revision 1.66
diff -u -r1.66 configure.tgt
--- gas/configure.tgt	28 Mar 2011 11:18:23 -0000	1.66
+++ gas/configure.tgt	30 Mar 2011 16:36:48 -0000
@@ -80,13 +80,8 @@
   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 @@
   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 @@
   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 @@
   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 ;;
Index: gas/testsuite/gas/all/gas.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/all/gas.exp,v
retrieving revision 1.69
diff -u -r1.69 gas.exp
--- gas/testsuite/gas/all/gas.exp	31 Dec 2010 20:01:39 -0000	1.69
+++ gas/testsuite/gas/all/gas.exp	30 Mar 2011 16:36:48 -0000
@@ -285,8 +285,8 @@
 # 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*] \
Index: gas/testsuite/gas/arm/arm.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/arm/arm.exp,v
retrieving revision 1.41
diff -u -r1.41 arm.exp
--- gas/testsuite/gas/arm/arm.exp	4 Jul 2005 14:55:52 -0000	1.41
+++ gas/testsuite/gas/arm/arm.exp	30 Mar 2011 16:36:48 -0000
@@ -2,6 +2,6 @@
 # Some ARM tests
 #
 
-if {[istarget *arm*-*-*] || [istarget *xscale*-*-*]} {
+if {[istarget arm*-*-*]} {
     run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
 }
Index: gas/testsuite/gas/cfi/cfi.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/cfi/cfi.exp,v
retrieving revision 1.26
diff -u -r1.26 cfi.exp
--- gas/testsuite/gas/cfi/cfi.exp	31 Dec 2010 18:40:23 -0000	1.26
+++ gas/testsuite/gas/cfi/cfi.exp	30 Mar 2011 16:36:48 -0000
@@ -72,7 +72,7 @@
 	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
Index: gas/testsuite/gas/elf/elf.exp
===================================================================
RCS file: /cvs/src/src/gas/testsuite/gas/elf/elf.exp,v
retrieving revision 1.75
diff -u -r1.75 elf.exp
--- gas/testsuite/gas/elf/elf.exp	25 Feb 2011 17:00:30 -0000	1.75
+++ gas/testsuite/gas/elf/elf.exp	30 Mar 2011 16:36:48 -0000
@@ -69,8 +69,7 @@
     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 @@
     # 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
Index: ld/configure.tgt
===================================================================
RCS file: /cvs/src/src/ld/configure.tgt,v
retrieving revision 1.241
diff -u -r1.241 configure.tgt
--- ld/configure.tgt	28 Mar 2011 11:18:27 -0000	1.241
+++ ld/configure.tgt	30 Mar 2011 16:36:49 -0000
@@ -97,18 +97,6 @@
 			;;
 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"
Index: ld/testsuite/ld-selective/selective.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-selective/selective.exp,v
retrieving revision 1.43
diff -u -r1.43 selective.exp
--- ld/testsuite/ld-selective/selective.exp	4 Dec 2010 18:32:52 -0000	1.43
+++ ld/testsuite/ld-selective/selective.exp	30 Mar 2011 16:36:49 -0000
@@ -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 @@
     }
 
     # 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
Index: ld/testsuite/ld-srec/srec.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-srec/srec.exp,v
retrieving revision 1.34
diff -u -r1.34 srec.exp
--- ld/testsuite/ld-srec/srec.exp	9 Feb 2011 08:18:54 -0000	1.34
+++ ld/testsuite/ld-srec/srec.exp	30 Mar 2011 16:36:49 -0000
@@ -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 @@
 	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 @@
 
 # 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 "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*"
Index: ld/testsuite/ld-undefined/undefined.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-undefined/undefined.exp,v
retrieving revision 1.31
diff -u -r1.31 undefined.exp
--- ld/testsuite/ld-undefined/undefined.exp	31 Dec 2010 22:56:36 -0000	1.31
+++ ld/testsuite/ld-undefined/undefined.exp	30 Mar 2011 16:36:49 -0000
@@ -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 @@
 # 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 @@
     # 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
Index: ld/testsuite/lib/ld-lib.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.79
diff -u -r1.79 ld-lib.exp
--- ld/testsuite/lib/ld-lib.exp	20 Nov 2010 15:36:34 -0000	1.79
+++ ld/testsuite/lib/ld-lib.exp	30 Mar 2011 16:36:50 -0000
@@ -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 @@
     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"
     }
 

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Ping Re: Remove code handling old ARM aliases
  2011-03-30 16:56 Remove code handling old ARM aliases Joseph S. Myers
@ 2011-04-05 14:40 ` Joseph S. Myers
  2011-04-06 16:18 ` Richard Earnshaw
  1 sibling, 0 replies; 4+ messages in thread
From: Joseph S. Myers @ 2011-04-05 14:40 UTC (permalink / raw)
  To: binutils

Ping.  This patch 
<http://sourceware.org/ml/binutils/2011-03/msg00576.html> is pending 
review.

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Remove code handling old ARM aliases
  2011-03-30 16:56 Remove code handling old ARM aliases Joseph S. Myers
  2011-04-05 14:40 ` Ping " Joseph S. Myers
@ 2011-04-06 16:18 ` Richard Earnshaw
  2011-04-06 17:14   ` Joseph S. Myers
  1 sibling, 1 reply; 4+ messages in thread
From: Richard Earnshaw @ 2011-04-06 16:18 UTC (permalink / raw)
  To: Joseph S. Myers; +Cc: binutils


On Wed, 2011-03-30 at 16:56 +0000, Joseph S. Myers wrote:
> There used to be various alternative target triplets for some ARM
> targets such as strongarm*-*-*, thumb*-*-* and xscale*-*-*.  These are
> now handled by config.sub as aliases for arm*-*-* (or in the case of
> ep9312*-*-*, rejected outright by config.sub), so no code in configure
> scripts or testsuites needs to allow for the old alternative names any
> more; this patch removes code handling them from binutils.  (Matches
> for *arm*-*-* presumably intended to match "strongarm"; where I
> encountered these in the course of making these fixes I changed them
> to arm*-*-*, but I didn't try to seek out all such cases
> systematically.  It's quite possible some code matches arm-*-* without
> the "*" after "arm", so missing some valid cases, but I didn't look
> for such problems either.)  OK to commit?
> 
> bfd:
> 2011-03-30  Joseph Myers  <joseph@codesourcery.com>
> 
> 	* 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:
> 2011-03-30  Joseph Myers  <joseph@codesourcery.com>
> 
> 	* configure.in (thumb-*-pe*): Remove.
> 	* configure: Regenerate.
> 
> binutils/testsuite:
> 2011-03-30  Joseph Myers  <joseph@codesourcery.com>
> 
> 	* binutils-all/objcopy.exp (*arm*-*-coff): Change to arm*-*-coff.
> 	(xscale-*-coff, thumb*-*-coff, thumb*-*-pe): Don't handle.
> 
> gas:
> 2011-03-30  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.
> 
> gas/testsuite:
> 2011-03-30  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.
> 
> ld:
> 2011-03-30  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.
> 
> ld/testsuite:
> 2011-03-30  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.
> 
> Index: bfd/config.bfd
> ===================================================================
> RCS file: /cvs/src/src/bfd/config.bfd,v
> retrieving revision 1.275
> diff -u -r1.275 config.bfd
> --- bfd/config.bfd	28 Mar 2011 11:18:25 -0000	1.275
> +++ bfd/config.bfd	30 Mar 2011 16:36:46 -0000
> @@ -53,7 +53,6 @@
>   sparc-*-lynxos* | \
>   vax-*-vms* | \
>   arm-*-oabi | \
> - thumb-*-oabi | \
>   a29k-* | \
>   hppa*-*-rtems* | \
>   *-go32-rtems* | \
> @@ -101,11 +100,8 @@
>  sh*)		 targ_archs=bfd_sh_arch ;;
>  sparc*)		 targ_archs=bfd_sparc_arch ;;
>  spu*)            targ_archs=bfd_spu_arch ;;
> -strongarm*)	 targ_archs=bfd_arm_arch ;;
> -thumb*)		 targ_archs=bfd_arm_arch ;;
>  v850*)		 targ_archs=bfd_v850_arch ;;
>  x86_64*)	 targ_archs=bfd_i386_arch ;;
> -xscale*)	 targ_archs=bfd_arm_arch ;;
>  xtensa*)	 targ_archs=bfd_xtensa_arch ;;
>  z80|r800)	 targ_archs=bfd_z80_arch ;;
>  z8k*)		 targ_archs=bfd_z8k_arch ;;
> @@ -275,7 +271,7 @@
>      targ_defvec=bfd_elf32_bigarm_vec
>      targ_selvecs=bfd_elf32_littlearm_vec
>      ;;
> -  arm-*-kaos* | strongarm-*-kaos*)
> +  arm-*-kaos*)
>      targ_defvec=bfd_elf32_littlearm_vec
>      targ_selvecs=bfd_elf32_bigarm_vec
>      ;;
> @@ -298,44 +294,6 @@
>      targ_selvecs=bfd_elf32_bigarm_vec
>      ;;
>  
> -  thumb-*-coff)
> -    targ_defvec=armcoff_little_vec
> -    targ_selvecs=armcoff_big_vec
> -    targ_underscore=yes
> -    ;;
> -  thumb-*-elf)
> -    targ_defvec=bfd_elf32_littlearm_vec
> -    targ_selvecs=bfd_elf32_bigarm_vec
> -    ;;
> -  thumb-epoc-pe*)
> -    targ_defvec=arm_epoc_pe_little_vec
> -    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
> -    targ_underscore=no
> -    ;;
> -  thumb-*-pe*)
> -    targ_defvec=armpe_little_vec
> -    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
> -    targ_underscore=yes
> -    ;;
> -  strongarm-*-elf)
> -    targ_defvec=bfd_elf32_littlearm_vec
> -    targ_selvecs=bfd_elf32_bigarm_vec
> -    ;;
> -  strongarm-*-coff)
> -    targ_defvec=armcoff_little_vec
> -    targ_selvecs=armcoff_big_vec
> -    targ_underscore=yes
> -    ;;
> -  xscale-*-elf)
> -    targ_defvec=bfd_elf32_littlearm_vec
> -    targ_selvecs=bfd_elf32_bigarm_vec
> -    ;;
> -  xscale-*-coff)
> -    targ_defvec=armcoff_little_vec
> -    targ_selvecs=armcoff_big_vec
> -    targ_underscore=yes
> -    ;;
> -
>    avr-*-*)
>      targ_defvec=bfd_elf32_avr_vec
>      ;;
> Index: binutils/configure
> ===================================================================
> RCS file: /cvs/src/src/binutils/configure,v
> retrieving revision 1.136
> diff -u -r1.136 configure
> --- binutils/configure	13 Feb 2011 21:00:11 -0000	1.136
> +++ binutils/configure	30 Mar 2011 16:36:48 -0000
> @@ -13846,15 +13846,6 @@
>  	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
>  	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
>  	  ;;
> -	thumb-*-pe*)
> -  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
> -	  if test -z "$DLLTOOL_DEFAULT"; then
> -	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
> -	  fi
> -	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
> -	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
> -	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
> -	  ;;
>  	x86_64-*-mingw*)
>    	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
>  	  if test -z "$DLLTOOL_DEFAULT"; then
> Index: binutils/configure.in
> ===================================================================
> RCS file: /cvs/src/src/binutils/configure.in,v
> retrieving revision 1.100
> diff -u -r1.100 configure.in
> --- binutils/configure.in	22 Apr 2010 14:37:05 -0000	1.100
> +++ binutils/configure.in	30 Mar 2011 16:36:48 -0000
> @@ -248,15 +248,6 @@
>  	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
>  	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
>  	  ;;
> -	thumb-*-pe*)
> -  	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
> -	  if test -z "$DLLTOOL_DEFAULT"; then
> -	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_ARM"
> -	  fi
> -	  DLLTOOL_DEFS="$DLLTOOL_DEFS -DDLLTOOL_ARM"
> -	  BUILD_WINDRES='$(WINDRES_PROG)$(EXEEXT)'
> -	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
> -	  ;;
>  	x86_64-*-mingw*)
>    	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
>  	  if test -z "$DLLTOOL_DEFAULT"; then
> Index: binutils/testsuite/binutils-all/objcopy.exp
> ===================================================================
> RCS file: /cvs/src/src/binutils/testsuite/binutils-all/objcopy.exp,v
> retrieving revision 1.71
> diff -u -r1.71 objcopy.exp
> --- binutils/testsuite/binutils-all/objcopy.exp	1 Jan 2011 01:56:59 -0000	1.71
> +++ binutils/testsuite/binutils-all/objcopy.exp	30 Mar 2011 16:36:48 -0000
> @@ -1,5 +1,5 @@
>  #   Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
> -#   2004, 2006, 2007, 2009, 2010
> +#   2004, 2006, 2007, 2009, 2010, 2011
>  #   Free Software Foundation, Inc.
>  
>  # This program is free software; you can redistribute it and/or modify
> @@ -620,11 +620,8 @@
>  	# mips_elf_sym_is_global.
>  	setup_xfail "mips*-*-elf"
>  
> -	setup_xfail "*arm*-*-coff"
> -	setup_xfail "xscale-*-coff"
> +	setup_xfail "arm*-*-coff"
>  	setup_xfail "arm*-*-pe"
> -	setup_xfail "thumb*-*-coff"
> -	setup_xfail "thumb*-*-pe"
>  	setup_xfail "*-*-mingw*"
>  	setup_xfail "*-*-cygwin*"
>      
> Index: gas/configure.tgt
> ===================================================================
> RCS file: /cvs/src/src/gas/configure.tgt,v
> retrieving revision 1.66
> diff -u -r1.66 configure.tgt
> --- gas/configure.tgt	28 Mar 2011 11:18:23 -0000	1.66
> +++ gas/configure.tgt	30 Mar 2011 16:36:48 -0000
> @@ -80,13 +80,8 @@
>    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 @@
>    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 @@
>    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 @@
>    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 ;;
> Index: gas/testsuite/gas/all/gas.exp
> ===================================================================
> RCS file: /cvs/src/src/gas/testsuite/gas/all/gas.exp,v
> retrieving revision 1.69
> diff -u -r1.69 gas.exp
> --- gas/testsuite/gas/all/gas.exp	31 Dec 2010 20:01:39 -0000	1.69
> +++ gas/testsuite/gas/all/gas.exp	30 Mar 2011 16:36:48 -0000
> @@ -285,8 +285,8 @@
>  # 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*] \
> Index: gas/testsuite/gas/arm/arm.exp
> ===================================================================
> RCS file: /cvs/src/src/gas/testsuite/gas/arm/arm.exp,v
> retrieving revision 1.41
> diff -u -r1.41 arm.exp
> --- gas/testsuite/gas/arm/arm.exp	4 Jul 2005 14:55:52 -0000	1.41
> +++ gas/testsuite/gas/arm/arm.exp	30 Mar 2011 16:36:48 -0000
> @@ -2,6 +2,6 @@
>  # Some ARM tests
>  #
>  
> -if {[istarget *arm*-*-*] || [istarget *xscale*-*-*]} {
> +if {[istarget arm*-*-*]} {
>      run_dump_tests [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
>  }
> Index: gas/testsuite/gas/cfi/cfi.exp
> ===================================================================
> RCS file: /cvs/src/src/gas/testsuite/gas/cfi/cfi.exp,v
> retrieving revision 1.26
> diff -u -r1.26 cfi.exp
> --- gas/testsuite/gas/cfi/cfi.exp	31 Dec 2010 18:40:23 -0000	1.26
> +++ gas/testsuite/gas/cfi/cfi.exp	30 Mar 2011 16:36:48 -0000
> @@ -72,7 +72,7 @@
>  	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
> Index: gas/testsuite/gas/elf/elf.exp
> ===================================================================
> RCS file: /cvs/src/src/gas/testsuite/gas/elf/elf.exp,v
> retrieving revision 1.75
> diff -u -r1.75 elf.exp
> --- gas/testsuite/gas/elf/elf.exp	25 Feb 2011 17:00:30 -0000	1.75
> +++ gas/testsuite/gas/elf/elf.exp	30 Mar 2011 16:36:48 -0000
> @@ -69,8 +69,7 @@
>      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 @@
>      # 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
> Index: ld/configure.tgt
> ===================================================================
> RCS file: /cvs/src/src/ld/configure.tgt,v
> retrieving revision 1.241
> diff -u -r1.241 configure.tgt
> --- ld/configure.tgt	28 Mar 2011 11:18:27 -0000	1.241
> +++ ld/configure.tgt	30 Mar 2011 16:36:49 -0000
> @@ -97,18 +97,6 @@
>  			;;
>  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"
> Index: ld/testsuite/ld-selective/selective.exp
> ===================================================================
> RCS file: /cvs/src/src/ld/testsuite/ld-selective/selective.exp,v
> retrieving revision 1.43
> diff -u -r1.43 selective.exp
> --- ld/testsuite/ld-selective/selective.exp	4 Dec 2010 18:32:52 -0000	1.43
> +++ ld/testsuite/ld-selective/selective.exp	30 Mar 2011 16:36:49 -0000
> @@ -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 @@
>      }
>  
>      # 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
> Index: ld/testsuite/ld-srec/srec.exp
> ===================================================================
> RCS file: /cvs/src/src/ld/testsuite/ld-srec/srec.exp,v
> retrieving revision 1.34
> diff -u -r1.34 srec.exp
> --- ld/testsuite/ld-srec/srec.exp	9 Feb 2011 08:18:54 -0000	1.34
> +++ ld/testsuite/ld-srec/srec.exp	30 Mar 2011 16:36:49 -0000
> @@ -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 @@
>  	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 @@
>  
>  # 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 "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*"
> Index: ld/testsuite/ld-undefined/undefined.exp
> ===================================================================
> RCS file: /cvs/src/src/ld/testsuite/ld-undefined/undefined.exp,v
> retrieving revision 1.31
> diff -u -r1.31 undefined.exp
> --- ld/testsuite/ld-undefined/undefined.exp	31 Dec 2010 22:56:36 -0000	1.31
> +++ ld/testsuite/ld-undefined/undefined.exp	30 Mar 2011 16:36:49 -0000
> @@ -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 @@
>  # 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 @@
>      # 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
> Index: ld/testsuite/lib/ld-lib.exp
> ===================================================================
> RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
> retrieving revision 1.79
> diff -u -r1.79 ld-lib.exp
> --- ld/testsuite/lib/ld-lib.exp	20 Nov 2010 15:36:34 -0000	1.79
> +++ ld/testsuite/lib/ld-lib.exp	30 Mar 2011 16:36:50 -0000
> @@ -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 @@
>      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"
>      }
>  


This is OK.  

Would it be unreasonable to get config.sub to also map "arm*" onto
"arm"?  

R.


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: Remove code handling old ARM aliases
  2011-04-06 16:18 ` Richard Earnshaw
@ 2011-04-06 17:14   ` Joseph S. Myers
  0 siblings, 0 replies; 4+ messages in thread
From: Joseph S. Myers @ 2011-04-06 17:14 UTC (permalink / raw)
  To: Richard Earnshaw; +Cc: binutils

On Wed, 6 Apr 2011, Richard Earnshaw wrote:

> Would it be unreasonable to get config.sub to also map "arm*" onto
> "arm"?  

It would be reasonable by my model of how target triplets should be used.  
However, it would require changes to code such as config.gcc that extracts 
meaningful information from the part after the "arm" (to determine default 
endianness for arm*-*-linux*, in that case).  (I think such code should be 
using the noncanonical target name, the same way that config.gcc handles a 
noncanonical target of pentium-linux, mapping to i586-pc-linux-gnu, and 
extracts default architecture information from the noncanonical name.)

-- 
Joseph S. Myers
joseph@codesourcery.com

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-04-06 17:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-03-30 16:56 Remove code handling old ARM aliases Joseph S. Myers
2011-04-05 14:40 ` Ping " Joseph S. Myers
2011-04-06 16:18 ` Richard Earnshaw
2011-04-06 17:14   ` Joseph S. Myers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).