Re: RFC: consolidate ARM config for BFD

[Simon Richter <Simon dot Richter at hogyros dot de>]

Hi,

Attached is the current version of the patch for bfd/config.bfd. Unlike
the last patch, it works. :-)

Comments?

   Simon
Index: bfd/config.bfd
===================================================================
RCS file: /cvs/src/src/bfd/config.bfd,v
retrieving revision 1.182
diff -u -r1.182 config.bfd
--- bfd/config.bfd	15 Mar 2005 14:14:08 -0000	1.182
+++ bfd/config.bfd	22 Mar 2005 00:40:18 -0000
@@ -42,6 +42,13 @@
 esac

 case $targ in
+ nto*arm*)
+    echo "*** Please use one of the arm*-*-nto* targets"
+    exit 1
+    ;;
+esac
+
+case $targ in
  m68*-*-lynxos* | \
  sparc-*-lynxos* | \
  vax-*-vms* | \
@@ -92,7 +99,6 @@
 *)		 targ_archs=bfd_${targ_cpu}_arch ;;
 esac

-
 # WHEN ADDING ENTRIES TO THIS MATRIX:
 #  Make sure that the left side always has two dashes.  Otherwise you
 #  can get spurious matches.  Even for unambiguous cases, do this as a
@@ -172,125 +178,124 @@
     targ_selvecs=bfd_elf32_bigarc_vec
     ;;

-  armeb-*-netbsdelf*)
-    targ_defvec=bfd_elf32_bigarm_vec
-    targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
-    ;;
-  arm-*-netbsdelf*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
-    ;;
-  arm-*-netbsd* | arm-*-openbsd*)
+  arm-*-netbsd* | thumb-*-netbsd* | strongarm-*-netbsd* | xscale-*-netbsd* | \
+  arm-*-openbsd* | thumb-*-openbsd* | strongarm-*-openbsd* | xscale-*-openbsd*)
     targ_defvec=armnetbsd_vec
     targ_selvecs="bfd_elf32_littlearm_vec bfd_elf32_bigarm_vec"
     targ_underscore=yes
     targ_cflags=-D__QNXTARGET__
     ;;
-  arm-*-nto* | nto*arm*)
+  arm*eb-*-netbsdelf* | thumb*eb-*-netbsdelf* | strongarm*eb-*-netbsdelf* | xscale*eb-*-netbsdelf* | \
+  arm*eb-*-netbsd-elf* | thumb*eb-*-netbsd-elf* | strongarm*eb-*-netbsd-elf* | xscale*eb-*-netbsd-elf*)
+    targ_defvec=bfd_elf32_bigarm_vec
+    targ_selvecs="bfd_elf32_littlearm_vec armnetbsd_vec"
+    ;;
+  arm*-*-netbsdelf* | thumb*-*-netbsdelf* | strongarm*-*-netbsdelf* | xscale*-*-netbsdelf* | \
+  arm*-*-netbsd-elf* | thumb*-*-netbsd-elf* | strongarm*-*-netbsd-elf* | xscale*-*-netbsd-elf*)
     targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+    targ_selvecs="bfd_elf32_bigarm_vec armnetbsd_vec"
     ;;
   arm-*-riscix*)
     targ_defvec=riscix_vec
     ;;
-  arm-epoc-pe*)
+  arm*eb-epoc-pe* | thumb*eb-epoc-pe* | strongarm*eb-epoc-pe* | xscale*eb-epoc-pe*)
+    targ_defvec=arm_epoc_pe_big_vec
+    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pei_big_vec arm_epoc_pei_little_vec"
+    targ_underscore=no
+    targ_cflags=-DARM_COFF_BUGFIX
+    ;;
+  arm*-epoc-pe* | thumb*-epoc-pe* | strongarm*-epoc-pe* | xscale*-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_selvecs="arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
     targ_underscore=no
     targ_cflags=-DARM_COFF_BUGFIX
     ;;
-  arm-wince-pe | arm-*-wince)
+  arm*eb-wince-* | thumb*eb-wince-* | strongarm*eb-wince-* | xscale*eb-wince-* | \
+  arm*eb-*-wince | thumb*eb-*-wince | strongarm*eb-*-wince | xscale*eb-*-wince)
     targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
+    targ_selvecs="armpe_big_vec armpei_little_vec armpei_big_vec"
+    targ_underscore=no
+    arg_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
+    ;;
+  arm*-wince-* | thumb*-wince-* | strongarm*-wince-* | xscale*-wince-* | \
+  arm*-*-wince | thumb*-*-wince | strongarm*-*-wince | xscale*-*-wince)
+    targ_defvec=armpe_big_vec
+    targ_selvecs="armpe_little_ve armpei_big_vec armpei_little_vec"
     targ_underscore=no
-    targ_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
+    arg_cflags="-DARM_WINCE -DARM_COFF_BUGFIX"
     ;;
-  arm-*-pe*)
+  arm*eb-*-pe | thumb*eb-*-pe | strongarm*eb-*-pe | xscale*eb-*-pe)
     targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
-    targ_underscore=yes
+    targ_selvecs="armpe_big_vec armpei_little_vec armpei_big_vec"
+    targ_underscore=no
     ;;
-  arm-*-aout | armel-*-aout)
-    targ_defvec=aout_arm_little_vec
-    targ_selvecs=aout_arm_big_vec
+  arm*-*-pe | thumb*-*-pe | strongarm*-*-pe | xscale*-*-pe)
+    targ_defvec=armpe_big_vec
+    targ_selvecs="armpe_little_ve armpei_big_vec armpei_little_vec"
+    targ_underscore=no
     ;;
-  armeb-*-aout)
+  arm*eb-*-aout | thumb*eb-*-aout | strongarm*eb-*-aout | xscale*eb-*-aout)
     targ_defvec=aout_arm_big_vec
     targ_selvecs=aout_arm_little_vec
     ;;
-  arm-*-coff)
+  arm*-*-aout | thumb*-*-aout | strongarm*-*-aout | xscale*-*-aout)
+    targ_defvec=aout_arm_little_vec
+    targ_selvecs=aout_arm_big_vec
+    ;;
+  arm*eb-*-coff | thumb*eb-*-coff | strongarm*eb-*-coff | xscale*eb-*-coff)
     targ_defvec=armcoff_little_vec
     targ_selvecs=armcoff_big_vec
     targ_underscore=yes
     ;;
-  arm-*-rtems*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  armeb-*-elf | arm*b-*-linux-gnu*)
-    targ_defvec=bfd_elf32_bigarm_vec
-    targ_selvecs=bfd_elf32_littlearm_vec
-    ;;
-  arm-*-kaos* | strongarm-*-kaos*)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | \
-  arm*-*-uclinux* | arm-*-kfreebsd*-gnu | \
-  arm*-*-eabi* )
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  arm*-*-vxworks | arm*-*-windiss)
-    targ_defvec=bfd_elf32_littlearm_vxworks_vec
-    targ_selvecs=bfd_elf32_bigarm_vxworks_vec
-    ;;
-  arm*-*-symbianelf*)
-    targ_defvec=bfd_elf32_littlearm_symbian_vec
-    targ_selvecs=bfd_elf32_bigarm_symbian_vec
-    ;;
-  arm9e-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-
-  thumb-*-coff)
+  arm*-*-coff | thumb*-*-coff | strongarm*-*-coff | xscale*-*-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
+  arm*eb-*-vxworks | thumb*eb-*-vxworks | strongarm*eb-*-vxworks | xscale*eb-*-vxworks | \
+  arm*eb-*-windiss | thumb*eb-*-windiss | strongarm*eb-*-windiss | xscale*eb-*-windiss)
+    targ_defvec=bfd_elf32_bigarm_vxworks_vec
+    targ_selvecs=bfd_elf32_littlearm_vxworks_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
+  arm*-*-vxworks | thumb*-*-vxworks | strongarm*-*-vxworks | xscale*-*-vxworks | \
+  arm*-*-windiss | thumb*-*-windiss | strongarm*-*-windiss | xscale*-*-windiss)
+    targ_defvec=bfd_elf32_littlearm_vxworks_vec
+    targ_selvecs=bfd_elf32_bigarm_vxworks_vec
     ;;
-  thumb-*-pe*)
-    targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
-    targ_underscore=yes
+  arm*eb-*-symbianelf* | thumb*eb-*-symbianelf* | xscale*eb-*-symbianelf*)
+    targ_defvec=bfd_elf32_bigarm_symbian_vec
+    targ_selvecs=bfd_elf32_littlearm_symbian_vec
     ;;
-  strongarm-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
+  arm*-*-symbianelf* | thumb*-*-symbianelf* | xscale*-*-symbianelf*)
+    targ_defvec=bfd_elf32_littlearm_symbian_vec
+    targ_selvecs=bfd_elf32_bigarm_symbian_vec
     ;;
-  strongarm-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
+  arm*eb-*-elf* | thumb*eb-*-elf* | strongarm*eb-*-elf* | xscale*eb-*-elf* | \
+  arm*eb-*-eabi* | thumb*eb-*-eabi* | strongarm*eb-*-eabi* | xscale*eb-*-eabi* | \
+  arm*eb-*-freebsd* | thumb*eb-*-freebsd* | strongarm*eb-*-freebsd* | xscale*eb-*-freebsd* | \
+  arm*eb-*-kfreebsd*-gnu | thumb*eb-*-kfreebsd*-gnu | strongarm*eb-*-kfreebsd*-gnu | xscale*eb-*-kfreebsd*-gnu | \
+  arm*eb-*-kaos* | thumb*eb-*-kaos* | strongarm*eb-*-kaos* | xscale*eb-*-kaos* | \
+  arm*eb-*-linux* | thumb*eb-*-linux* | strongarm*eb-*-linux* | xscale*eb-*-linux* | \
+  arm*eb-*-uclinux* | thumb*eb-*-uclinux* | strongarm*eb-*-uclinux* | xscale*eb-*-uclinux* | \
+  arm*eb-*-conix* | thumb*eb-*-conix* | strongarm*eb-*-conix* | xscale*eb-*-conix* | \
+  arm*eb-*-nto* | thumb*eb-*-nto* | strongarm*eb-*-nto* | xscale*eb-*-nto* | \
+  arm*eb-*-rtems* | thumb*eb-*-rtems* | strongarm*eb-*-rtems* | xscale*eb-*-rtems*)
+    targ_defvec=bfd_elf32_bigarm_vec
+    targ_selvecs=bfd_elf32_littlearm_vec
     ;;
-  xscale-*-elf)
+  arm*-*-elf* | thumb*-*-elf* | strongarm*-*-elf* | xscale*-*-elf* | \
+  arm*-*-eabi* | thumb*-*-eabi* | strongarm*-*-eabi* | xscale*-*-eabi* | \
+  arm*-*-freebsd* | thumb*-*-freebsd* | strongarm*-*-freebsd* | xscale*-*-freebsd* | \
+  arm*-*-kfreebsd*-gnu | thumb*-*-kfreebsd*-gnu | strongarm*-*-kfreebsd*-gnu | xscale*-*-kfreebsd*-gnu | \
+  arm*-*-kaos* | thumb*-*-kaos* | strongarm*-*-kaos* | xscale*-*-kaos* | \
+  arm*-*-linux* | thumb*-*-linux* | strongarm*-*-linux* | xscale*-*-linux* | \
+  arm*-*-uclinux* | thumb*-*-uclinux* | strongarm*-*-uclinux* | xscale*-*-uclinux* | \
+  arm*-*-conix* | thumb*-*-conix* | strongarm*-*-conix* | xscale*-*-conix* | \
+  arm*-*-nto* | thumb*-*-nto* | strongarm*-*-nto* | xscale*-*-nto* | \
+  arm*-*-rtems* | thumb*-*-rtems* | strongarm*-*-rtems* | xscale*-*-rtems*)
     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
-    ;;

   a29k-*-ebmon* | a29k-*-udi* | a29k-*-coff* | a29k-*-sym1* | \
   a29k-*-vxworks* | a29k-*-sysv* | a29k-*rtems*)

Attachment: signature.asc
Description: OpenPGP digital signature