From 4101eec8ebf4595ae25f6947b82b6c2d822ffa76 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 16 Aug 2004 08:25:44 +0000 Subject: [PATCH] Sort architecture based tables alphabetically. --- gas/ChangeLog | 5 +++++ gas/configure | 41 +++++++++++++++++++++++------------------ gas/configure.in | 37 +++++++++++++++++++++---------------- 3 files changed, 49 insertions(+), 34 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index e48d644..797ada7 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2004-08-16 Nick Clifton + + * configure.in: Sort architecture based tables alphabetically. + * configure: Regenerate. + 2004-08-16 Alan Modra * config/tc-ppc.c (tc_ppc_regname_to_dw2regnum ): Replace diff --git a/gas/configure b/gas/configure index 08ffddd..a27d90a 100755 --- a/gas/configure +++ b/gas/configure @@ -3340,7 +3340,7 @@ darwin* | rhapsody*) esac ;; -freebsd* ) +freebsd* | kfreebsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then case $host_cpu in i*86 ) @@ -3408,7 +3408,7 @@ linux-gnu*) lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; -netbsd*) +netbsd* | knetbsd*-gnu) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$' else @@ -4159,7 +4159,8 @@ for this_target in $target $canon_targets ; do eval `echo $this_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/cpu=\1 vendor=\2 os=\3/'` - # check for architecture variants + # Check for architecture variants. + # Note: This table is alpha-sorted, please try to keep it that way. arch= endian= case ${cpu} in @@ -4169,12 +4170,14 @@ for this_target in $target $canon_targets ; do arm*b|xscale*b|strongarm*b) cpu_type=arm endian=big ;; arm*|xscale*|strongarm*) cpu_type=arm endian=little ;; c4x*) cpu_type=tic4x ;; + crx*) cpu_type=crx endian=little ;; hppa*) cpu_type=hppa ;; i[3-7]86) cpu_type=i386 arch=i386;; - x86_64) cpu_type=i386 arch=x86_64;; ia64) cpu_type=ia64 ;; ip2k) cpu_type=ip2k endian=big ;; iq2000) cpu_type=iq2000 endian=big ;; + m32r) cpu_type=m32r target_cpu=m32r endian=big ;; + m32rle) cpu_type=m32r target_cpu=m32r endian=little ;; m6811|m6812|m68hc12) cpu_type=m68hc11 ;; m680[012346]0) cpu_type=m68k ;; m68008) cpu_type=m68k ;; @@ -4203,10 +4206,8 @@ for this_target in $target $canon_targets ; do sparc86x*) cpu_type=sparc arch=sparc86x ;; sparc*) cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c. v850*) cpu_type=v850 ;; - crx*) cpu_type=crx endian=little ;; + x86_64) cpu_type=i386 arch=x86_64;; xtensa*) cpu_type=xtensa arch=xtensa ;; - m32r) cpu_type=m32r target_cpu=m32r endian=big ;; - m32rle) cpu_type=m32r target_cpu=m32r endian=little ;; *) cpu_type=${cpu} ;; esac @@ -4221,7 +4222,8 @@ for this_target in $target $canon_targets ; do bfd_gas=no em=generic - # assign object format + # Assign object format. + # Note: This table is alpha-sorted, please try to keep it that way. case ${generic_target} in a29k-*-coff) fmt=coff ;; a29k-amd-udi) fmt=coff ;; @@ -4237,9 +4239,6 @@ for this_target in $target $canon_targets ; do alpha*-*-netbsd*) fmt=elf em=nbsd ;; alpha*-*-openbsd*) fmt=elf em=obsd ;; - # cpu_type for am33_2.0 is set to mn10300 - mn10300-*-linux*) fmt=elf bfd_gas=yes em=linux ;; - arc-*-elf*) fmt=elf ;; arm-*-aout) fmt=aout ;; @@ -4449,12 +4448,22 @@ echo "$as_me: error: Unknown vendor for mips-bsd configuration." >&2;} mmix-*-*) fmt=elf ;; mn10200-*-*) fmt=elf ;; + # cpu_type for am33_2.0 is set to mn10300 + mn10300-*-linux*) fmt=elf bfd_gas=yes em=linux ;; mn10300-*-*) fmt=elf ;; + msp430-*-*) fmt=elf ;; + + ns32k-pc532-mach*) fmt=aout em=pc532mach ;; + ns32k-pc532-ux*) fmt=aout em=pc532mach ;; + ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; + ns32k-*-*n*bsd*) fmt=aout em=nbsd532 ;; + openrisc-*-*) fmt=elf ;; or32-*-rtems*) fmt=elf ;; or32-*-coff) fmt=coff ;; or32-*-elf) fmt=elf ;; + pj*) fmt=elf ;; ppc-*-pe | ppc-*-cygwin*) fmt=coff em=pe ;; @@ -4525,11 +4534,6 @@ _ACEOF shle*-*-kaos*) fmt=elf ;; sh64-*-elf*) fmt=elf ;; - ns32k-pc532-mach*) fmt=aout em=pc532mach ;; - ns32k-pc532-ux*) fmt=aout em=pc532mach ;; - ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; - ns32k-*-*n*bsd*) fmt=aout em=nbsd532 ;; - sparc-*-rtemsaout*) fmt=aout ;; sparc-*-rtemself*) fmt=elf ;; sparc-*-rtems*) fmt=elf ;; @@ -4551,8 +4555,6 @@ _ACEOF strongarm-*-coff) fmt=coff ;; strongarm-*-elf) fmt=elf ;; strongarm-*-kaos*) fmt=elf ;; - xscale-*-coff) fmt=coff ;; - xscale-*-elf) fmt=elf ;; tic30-*-*aout*) fmt=aout bfd_gas=yes ;; tic30-*-*coff*) fmt=coff bfd_gas=yes ;; @@ -4572,6 +4574,9 @@ _ACEOF w65-*-*) fmt=coff ;; + xscale-*-coff) fmt=coff ;; + xscale-*-elf) fmt=elf ;; + xstormy16-*-*) fmt=elf ;; xtensa-*-*) fmt=elf ;; diff --git a/gas/configure.in b/gas/configure.in index d8d3e91..80184b2 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -118,7 +118,8 @@ changequote(,)dnl eval `echo $this_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/cpu=\1 vendor=\2 os=\3/'` changequote([,])dnl - # check for architecture variants + # Check for architecture variants. + # Note: This table is alpha-sorted, please try to keep it that way. arch= endian= case ${cpu} in @@ -128,13 +129,15 @@ changequote([,])dnl arm*b|xscale*b|strongarm*b) cpu_type=arm endian=big ;; arm*|xscale*|strongarm*) cpu_type=arm endian=little ;; c4x*) cpu_type=tic4x ;; + crx*) cpu_type=crx endian=little ;; hppa*) cpu_type=hppa ;; changequote(,)dnl i[3-7]86) cpu_type=i386 arch=i386;; - x86_64) cpu_type=i386 arch=x86_64;; ia64) cpu_type=ia64 ;; ip2k) cpu_type=ip2k endian=big ;; iq2000) cpu_type=iq2000 endian=big ;; + m32r) cpu_type=m32r target_cpu=m32r endian=big ;; + m32rle) cpu_type=m32r target_cpu=m32r endian=little ;; m6811|m6812|m68hc12) cpu_type=m68hc11 ;; m680[012346]0) cpu_type=m68k ;; changequote([,])dnl @@ -164,10 +167,8 @@ changequote([,])dnl sparc86x*) cpu_type=sparc arch=sparc86x ;; sparc*) cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c. v850*) cpu_type=v850 ;; - crx*) cpu_type=crx endian=little ;; + x86_64) cpu_type=i386 arch=x86_64;; xtensa*) cpu_type=xtensa arch=xtensa ;; - m32r) cpu_type=m32r target_cpu=m32r endian=big ;; - m32rle) cpu_type=m32r target_cpu=m32r endian=little ;; *) cpu_type=${cpu} ;; esac @@ -182,7 +183,8 @@ changequote([,])dnl bfd_gas=no em=generic - # assign object format + # Assign object format. + # Note: This table is alpha-sorted, please try to keep it that way. case ${generic_target} in a29k-*-coff) fmt=coff ;; a29k-amd-udi) fmt=coff ;; @@ -198,9 +200,6 @@ changequote([,])dnl alpha*-*-netbsd*) fmt=elf em=nbsd ;; alpha*-*-openbsd*) fmt=elf em=obsd ;; - # cpu_type for am33_2.0 is set to mn10300 - mn10300-*-linux*) fmt=elf bfd_gas=yes em=linux ;; - arc-*-elf*) fmt=elf ;; arm-*-aout) fmt=aout ;; @@ -401,12 +400,22 @@ changequote([,])dnl mmix-*-*) fmt=elf ;; mn10200-*-*) fmt=elf ;; + # cpu_type for am33_2.0 is set to mn10300 + mn10300-*-linux*) fmt=elf bfd_gas=yes em=linux ;; mn10300-*-*) fmt=elf ;; + msp430-*-*) fmt=elf ;; + + ns32k-pc532-mach*) fmt=aout em=pc532mach ;; + ns32k-pc532-ux*) fmt=aout em=pc532mach ;; + ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; + ns32k-*-*n*bsd*) fmt=aout em=nbsd532 ;; + openrisc-*-*) fmt=elf ;; or32-*-rtems*) fmt=elf ;; or32-*-coff) fmt=coff ;; or32-*-elf) fmt=elf ;; + pj*) fmt=elf ;; ppc-*-pe | ppc-*-cygwin*) fmt=coff em=pe ;; @@ -465,11 +474,6 @@ changequote([,])dnl shle*-*-kaos*) fmt=elf ;; sh64-*-elf*) fmt=elf ;; - ns32k-pc532-mach*) fmt=aout em=pc532mach ;; - ns32k-pc532-ux*) fmt=aout em=pc532mach ;; - ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; - ns32k-*-*n*bsd*) fmt=aout em=nbsd532 ;; - sparc-*-rtemsaout*) fmt=aout ;; sparc-*-rtemself*) fmt=elf ;; sparc-*-rtems*) fmt=elf ;; @@ -491,8 +495,6 @@ changequote([,])dnl strongarm-*-coff) fmt=coff ;; strongarm-*-elf) fmt=elf ;; strongarm-*-kaos*) fmt=elf ;; - xscale-*-coff) fmt=coff ;; - xscale-*-elf) fmt=elf ;; tic30-*-*aout*) fmt=aout bfd_gas=yes ;; tic30-*-*coff*) fmt=coff bfd_gas=yes ;; @@ -512,6 +514,9 @@ changequote([,])dnl w65-*-*) fmt=coff ;; + xscale-*-coff) fmt=coff ;; + xscale-*-elf) fmt=elf ;; + xstormy16-*-*) fmt=elf ;; xtensa-*-*) fmt=elf ;; -- 2.7.4