debian/patches/any/submitted-autotools.diff

   1 2009-05-10  Aurelien Jarno  <aurelien@aurel32.net>
   2
   3         * scripts/config.guess: update to version 2009-04-27.
   4         * scripts/config.sub: ditto.
   5
   6 ---
   7  scripts/config.guess |  117 ++++++++++++++++++++++++++++---------
   8  scripts/config.sub   |  159 +++++++++++++++++++++++++++++++++++++--------------
   9  2 files changed, 208 insertions(+), 68 deletions(-)
  10
  11 --- a/scripts/config.guess
  12 +++ b/scripts/config.guess
  13 @@ -1,10 +1,10 @@
  14  #! /bin/sh
  15  # Attempt to guess a canonical system name.
  16  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  17 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
  18 -#   Inc.
  19 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
  20 +#   Free Software Foundation, Inc.
  21
  22 -timestamp='2006-02-27'
  23 +timestamp='2009-04-27'
  24
  25  # This file is free software; you can redistribute it and/or modify it
  26  # under the terms of the GNU General Public License as published by
  27 @@ -56,8 +56,8 @@
  28  GNU config.guess ($timestamp)
  29
  30  Originally written by Per Bothner.
  31 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  32 -Free Software Foundation, Inc.
  33 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
  34 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
  35
  36  This is free software; see the source for copying conditions.  There is NO
  37  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
  38 @@ -161,6 +161,7 @@
  39             arm*) machine=arm-unknown ;;
  40             sh3el) machine=shl-unknown ;;
  41             sh3eb) machine=sh-unknown ;;
  42 +           sh5el) machine=sh5le-unknown ;;
  43             *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  44         esac
  45         # The Operating System including object format, if it has switched
  46 @@ -211,7 +212,7 @@
  47         echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
  48         exit ;;
  49      macppc:MirBSD:*:*)
  50 -       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
  51 +       echo powerpc-unknown-mirbsd${UNAME_RELEASE}
  52         exit ;;
  53      *:MirBSD:*:*)
  54         echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
  55 @@ -323,14 +324,30 @@
  56         case `/usr/bin/uname -p` in
  57             sparc) echo sparc-icl-nx7; exit ;;
  58         esac ;;
  59 +    s390x:SunOS:*:*)
  60 +       echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  61 +       exit ;;
  62      sun4H:SunOS:5.*:*)
  63         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  64         exit ;;
  65      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
  66         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  67         exit ;;
  68 -    i86pc:SunOS:5.*:*)
  69 -       echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  70 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
  71 +       eval $set_cc_for_build
  72 +       SUN_ARCH="i386"
  73 +       # If there is a compiler, see if it is configured for 64-bit objects.
  74 +       # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
  75 +       # This test works for both compilers.
  76 +       if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
  77 +           if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
  78 +               (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
  79 +               grep IS_64BIT_ARCH >/dev/null
  80 +           then
  81 +               SUN_ARCH="x86_64"
  82 +           fi
  83 +       fi
  84 +       echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  85         exit ;;
  86      sun4*:SunOS:6*:*)
  87         # According to config.sub, this is the proper way to canonicalize
  88 @@ -531,7 +548,7 @@
  89                 echo rs6000-ibm-aix3.2
  90         fi
  91         exit ;;
  92 -    *:AIX:*:[45])
  93 +    *:AIX:*:[456])
  94         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  95         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  96                 IBM_ARCH=rs6000
  97 @@ -771,6 +788,8 @@
  98         case ${UNAME_MACHINE} in
  99             pc98)
 100                 echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 101 +           amd64)
 102 +               echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 103             *)
 104                 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 105         esac
 106 @@ -778,10 +797,7 @@
 107      i*:CYGWIN*:*)
 108         echo ${UNAME_MACHINE}-pc-cygwin
 109         exit ;;
 110 -    i*:MINGW*:*)
 111 -       echo ${UNAME_MACHINE}-pc-mingw32
 112 -       exit ;;
 113 -    i*:MSYS_NT-*:*:*)
 114 +    *:MINGW*:*)
 115         echo ${UNAME_MACHINE}-pc-mingw32
 116         exit ;;
 117      i*:windows32*:*)
 118 @@ -791,12 +807,18 @@
 119      i*:PW*:*)
 120         echo ${UNAME_MACHINE}-pc-pw32
 121         exit ;;
 122 -    x86:Interix*:[345]*)
 123 -       echo i586-pc-interix${UNAME_RELEASE}
 124 -       exit ;;
 125 -    EM64T:Interix*:[345]*)
 126 -       echo x86_64-unknown-interix${UNAME_RELEASE}
 127 -       exit ;;
 128 +    *:Interix*:[3456]*)
 129 +       case ${UNAME_MACHINE} in
 130 +           x86)
 131 +               echo i586-pc-interix${UNAME_RELEASE}
 132 +               exit ;;
 133 +           EM64T | authenticamd | genuineintel)
 134 +               echo x86_64-unknown-interix${UNAME_RELEASE}
 135 +               exit ;;
 136 +           IA64)
 137 +               echo ia64-unknown-interix${UNAME_RELEASE}
 138 +               exit ;;
 139 +       esac ;;
 140      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 141         echo i${UNAME_MACHINE}-pc-mks
 142         exit ;;
 143 @@ -830,6 +852,16 @@
 144         echo ${UNAME_MACHINE}-pc-minix
 145         exit ;;
 146      arm*:Linux:*:*)
 147 +       eval $set_cc_for_build
 148 +       if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 149 +           | grep -q __ARM_EABI__
 150 +       then
 151 +           echo ${UNAME_MACHINE}-unknown-linux-gnu
 152 +       else
 153 +           echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 154 +       fi
 155 +       exit ;;
 156 +    avr32*:Linux:*:*)
 157         echo ${UNAME_MACHINE}-unknown-linux-gnu
 158         exit ;;
 159      cris:Linux:*:*)
 160 @@ -919,6 +951,9 @@
 161         if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 162         echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 163         exit ;;
 164 +    padre:Linux:*:*)
 165 +       echo sparc-unknown-linux-gnu
 166 +       exit ;;
 167      parisc:Linux:*:* | hppa:Linux:*:*)
 168         # Look for CPU level
 169         case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
 170 @@ -948,6 +983,9 @@
 171      x86_64:Linux:*:*)
 172         echo x86_64-unknown-linux-gnu
 173         exit ;;
 174 +    xtensa*:Linux:*:*)
 175 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
 176 +       exit ;;
 177      i*86:Linux:*:*)
 178         # The BFD linker knows what the default object file format is, so
 179         # first see if it will tell us. cd to the root directory to prevent
 180 @@ -966,9 +1004,6 @@
 181           a.out-i386-linux)
 182                 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 183                 exit ;;
 184 -         coff-i386)
 185 -               echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 186 -               exit ;;
 187           "")
 188                 # Either a pre-BFD a.out linker (linux-gnuoldld) or
 189                 # one that does not give us useful --help.
 190 @@ -990,7 +1025,7 @@
 191         LIBC=gnulibc1
 192         # endif
 193         #else
 194 -       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
 195 +       #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 196         LIBC=gnu
 197         #else
 198         LIBC=gnuaout
 199 @@ -1083,8 +1118,11 @@
 200      pc:*:*:*)
 201         # Left here for compatibility:
 202          # uname -m prints for DJGPP always 'pc', but it prints nothing about
 203 -        # the processor, so we play safe by assuming i386.
 204 -       echo i386-pc-msdosdjgpp
 205 +        # the processor, so we play safe by assuming i586.
 206 +       # Note: whatever this is, it MUST be the same as what config.sub
 207 +       # prints for the "djgpp" host, or else GDB configury will decide that
 208 +       # this is a cross-build.
 209 +       echo i586-pc-msdosdjgpp
 210          exit ;;
 211      Intel:Mach:3*:*)
 212         echo i386-pc-mach3
 213 @@ -1122,6 +1160,16 @@
 214      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
 215          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 216            && { echo i486-ncr-sysv4; exit; } ;;
 217 +    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 218 +       OS_REL='.3'
 219 +       test -r /etc/.relid \
 220 +           && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 221 +       /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 222 +           && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 223 +       /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 224 +           && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 225 +       /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 226 +           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 227      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 228         echo m68k-unknown-lynxos${UNAME_RELEASE}
 229         exit ;;
 230 @@ -1197,6 +1245,9 @@
 231      BePC:BeOS:*:*)     # BeOS running on Intel PC compatible.
 232         echo i586-pc-beos
 233         exit ;;
 234 +    BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
 235 +       echo i586-pc-haiku
 236 +       exit ;;
 237      SX-4:SUPER-UX:*:*)
 238         echo sx4-nec-superux${UNAME_RELEASE}
 239         exit ;;
 240 @@ -1206,6 +1257,15 @@
 241      SX-6:SUPER-UX:*:*)
 242         echo sx6-nec-superux${UNAME_RELEASE}
 243         exit ;;
 244 +    SX-7:SUPER-UX:*:*)
 245 +       echo sx7-nec-superux${UNAME_RELEASE}
 246 +       exit ;;
 247 +    SX-8:SUPER-UX:*:*)
 248 +       echo sx8-nec-superux${UNAME_RELEASE}
 249 +       exit ;;
 250 +    SX-8R:SUPER-UX:*:*)
 251 +       echo sx8r-nec-superux${UNAME_RELEASE}
 252 +       exit ;;
 253      Power*:Rhapsody:*:*)
 254         echo powerpc-apple-rhapsody${UNAME_RELEASE}
 255         exit ;;
 256 @@ -1296,6 +1356,9 @@
 257      i*86:rdos:*:*)
 258         echo ${UNAME_MACHINE}-pc-rdos
 259         exit ;;
 260 +    i*86:AROS:*:*)
 261 +       echo ${UNAME_MACHINE}-pc-aros
 262 +       exit ;;
 263  esac
 264
 265  #echo '(No uname command or uname output not recognized.)' 1>&2
 266 @@ -1456,9 +1519,9 @@
 267  the operating system you are using. It is advised that you
 268  download the most up to date version of the config scripts from
 269
 270 -  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
 271 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 272  and
 273 -  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
 274 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 275
 276  If the version you run ($0) is already up to date, please
 277  send the following data and any information you think might be
 278 --- a/scripts/config.sub
 279 +++ b/scripts/config.sub
 280 @@ -1,10 +1,10 @@
 281  #! /bin/sh
 282  # Configuration validation subroutine script.
 283  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 284 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
 285 -#   Inc.
 286 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 287 +#   Free Software Foundation, Inc.
 288
 289 -timestamp='2006-02-27'
 290 +timestamp='2009-04-17'
 291
 292  # This file is (in principle) common to ALL GNU software.
 293  # The presence of a machine in this file suggests that SOME GNU software
 294 @@ -72,8 +72,8 @@
 295  version="\
 296  GNU config.sub ($timestamp)
 297
 298 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 299 -Free Software Foundation, Inc.
 300 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
 301 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 302
 303  This is free software; see the source for copying conditions.  There is NO
 304  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 305 @@ -122,6 +122,7 @@
 306  case $maybe_os in
 307    nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
 308    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
 309 +  kopensolaris*-gnu* | \
 310    storm-chaos* | os2-emx* | rtmk-nova*)
 311      os=-$maybe_os
 312      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 313 @@ -241,20 +242,24 @@
 314         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 315         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 316         | am33_2.0 \
 317 -       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 318 +       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 319         | bfin \
 320         | c4x | clipper \
 321         | d10v | d30v | dlx | dsp16xx \
 322 -       | fr30 | frv \
 323 +       | fido | fr30 | frv \
 324         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 325         | i370 | i860 | i960 | ia64 \
 326         | ip2k | iq2000 \
 327 -       | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
 328 +       | lm32 \
 329 +       | m32c | m32r | m32rle | m68000 | m68k | m88k \
 330 +       | maxq | mb | microblaze | mcore | mep | metag \
 331         | mips | mipsbe | mipseb | mipsel | mipsle \
 332         | mips16 \
 333         | mips64 | mips64el \
 334 -       | mips64vr | mips64vrel \
 335 +       | mips64octeon | mips64octeonel \
 336         | mips64orion | mips64orionel \
 337 +       | mips64r5900 | mips64r5900el \
 338 +       | mips64vr | mips64vrel \
 339         | mips64vr4100 | mips64vr4100el \
 340         | mips64vr4300 | mips64vr4300el \
 341         | mips64vr5000 | mips64vr5000el \
 342 @@ -267,6 +272,7 @@
 343         | mipsisa64sr71k | mipsisa64sr71kel \
 344         | mipstx39 | mipstx39el \
 345         | mn10200 | mn10300 \
 346 +       | moxie \
 347         | mt \
 348         | msp430 \
 349         | nios | nios2 \
 350 @@ -275,19 +281,17 @@
 351         | pdp10 | pdp11 | pj | pjl \
 352         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 353         | pyramid \
 354 -       | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 355 +       | score \
 356 +       | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 357         | sh64 | sh64le \
 358 -       | sparc | sparc64 | sparc64b | sparc64v | sparc64v2 | sparc86x | sparclet | sparclite \
 359 -       | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sparcv9v2 \
 360 -       | strongarm \
 361 +       | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 362 +       | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 363 +       | spu | strongarm \
 364         | tahoe | thumb | tic4x | tic80 | tron \
 365         | v850 | v850e \
 366         | we32k \
 367 -       | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 368 -       | z8k)
 369 -               basic_machine=$basic_machine-unknown
 370 -               ;;
 371 -       m32c)
 372 +       | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 373 +       | z8k | z80)
 374                 basic_machine=$basic_machine-unknown
 375                 ;;
 376         m6811 | m68hc11 | m6812 | m68hc12)
 377 @@ -319,25 +323,28 @@
 378         | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 379         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 380         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 381 -       | avr-* \
 382 +       | avr-* | avr32-* \
 383         | bfin-* | bs2000-* \
 384         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
 385         | clipper-* | craynv-* | cydra-* \
 386         | d10v-* | d30v-* | dlx-* \
 387         | elxsi-* \
 388 -       | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
 389 +       | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 390         | h8300-* | h8500-* \
 391         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 392         | i*86-* | i860-* | i960-* | ia64-* \
 393         | ip2k-* | iq2000-* \
 394 -       | m32r-* | m32rle-* \
 395 +       | lm32-* \
 396 +       | m32c-* | m32r-* | m32rle-* \
 397         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 398 -       | m88110-* | m88k-* | maxq-* | mcore-* \
 399 +       | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 400         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 401         | mips16-* \
 402         | mips64-* | mips64el-* \
 403 -       | mips64vr-* | mips64vrel-* \
 404 +       | mips64octeon-* | mips64octeonel-* \
 405         | mips64orion-* | mips64orionel-* \
 406 +       | mips64r5900-* | mips64r5900el-* \
 407 +       | mips64vr-* | mips64vrel-* \
 408         | mips64vr4100-* | mips64vr4100el-* \
 409         | mips64vr4300-* | mips64vr4300el-* \
 410         | mips64vr5000-* | mips64vr5000el-* \
 411 @@ -359,22 +366,24 @@
 412         | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 413         | pyramid-* \
 414         | romp-* | rs6000-* \
 415 -       | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 416 +       | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 417         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 418 -       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc64v2-* | sparc86x-* | sparclet-* \
 419 +       | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 420         | sparclite-* \
 421 -       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sparcv9v2-* | strongarm-* | sv1-* | sx?-* \
 422 +       | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 423         | tahoe-* | thumb-* \
 424 -       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 425 +       | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 426         | tron-* \
 427         | v850-* | v850e-* | vax-* \
 428         | we32k-* \
 429 -       | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
 430 -       | xstormy16-* | xtensa-* \
 431 +       | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 432 +       | xstormy16-* | xtensa*-* \
 433         | ymp-* \
 434 -       | z8k-*)
 435 +       | z8k-* | z80-*)
 436                 ;;
 437 -       m32c-*)
 438 +       # Recognize the basic CPU types without company name, with glob match.
 439 +       xtensa*)
 440 +               basic_machine=$basic_machine-unknown
 441                 ;;
 442         # Recognize the various machine names and aliases which stand
 443         # for a CPU type and a company and sometimes even an OS.
 444 @@ -438,6 +447,10 @@
 445                 basic_machine=m68k-apollo
 446                 os=-bsd
 447                 ;;
 448 +       aros)
 449 +               basic_machine=i386-pc
 450 +               os=-aros
 451 +               ;;
 452         aux)
 453                 basic_machine=m68k-apple
 454                 os=-aux
 455 @@ -446,10 +459,22 @@
 456                 basic_machine=ns32k-sequent
 457                 os=-dynix
 458                 ;;
 459 +       blackfin)
 460 +               basic_machine=bfin-unknown
 461 +               os=-linux
 462 +               ;;
 463 +       blackfin-*)
 464 +               basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 465 +               os=-linux
 466 +               ;;
 467         c90)
 468                 basic_machine=c90-cray
 469                 os=-unicos
 470                 ;;
 471 +        cegcc)
 472 +               basic_machine=arm-unknown
 473 +               os=-cegcc
 474 +               ;;
 475         convex-c1)
 476                 basic_machine=c1-convex
 477                 os=-bsd
 478 @@ -478,8 +503,8 @@
 479                 basic_machine=craynv-cray
 480                 os=-unicosmp
 481                 ;;
 482 -       cr16c)
 483 -               basic_machine=cr16c-unknown
 484 +       cr16)
 485 +               basic_machine=cr16-unknown
 486                 os=-elf
 487                 ;;
 488         crds | unos)
 489 @@ -517,6 +542,10 @@
 490                 basic_machine=m88k-motorola
 491                 os=-sysv3
 492                 ;;
 493 +       dicos)
 494 +               basic_machine=i686-pc
 495 +               os=-dicos
 496 +               ;;
 497         djgpp)
 498                 basic_machine=i586-pc
 499                 os=-msdosdjgpp
 500 @@ -671,6 +700,14 @@
 501                 basic_machine=m68k-isi
 502                 os=-sysv
 503                 ;;
 504 +       m68knommu)
 505 +               basic_machine=m68k-unknown
 506 +               os=-linux
 507 +               ;;
 508 +       m68knommu-*)
 509 +               basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
 510 +               os=-linux
 511 +               ;;
 512         m88k-omron*)
 513                 basic_machine=m88k-omron
 514                 ;;
 515 @@ -686,6 +723,10 @@
 516                 basic_machine=i386-pc
 517                 os=-mingw32
 518                 ;;
 519 +       mingw32ce)
 520 +               basic_machine=arm-unknown
 521 +               os=-mingw32ce
 522 +               ;;
 523         miniframe)
 524                 basic_machine=m68000-convergent
 525                 ;;
 526 @@ -812,6 +853,14 @@
 527                 basic_machine=i860-intel
 528                 os=-osf
 529                 ;;
 530 +       parisc)
 531 +               basic_machine=hppa-unknown
 532 +               os=-linux
 533 +               ;;
 534 +       parisc-*)
 535 +               basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
 536 +               os=-linux
 537 +               ;;
 538         pbd)
 539                 basic_machine=sparc-tti
 540                 ;;
 541 @@ -913,6 +962,10 @@
 542         sb1el)
 543                 basic_machine=mipsisa64sb1el-unknown
 544                 ;;
 545 +       sde)
 546 +               basic_machine=mipsisa32-sde
 547 +               os=-elf
 548 +               ;;
 549         sei)
 550                 basic_machine=mips-sei
 551                 os=-seiux
 552 @@ -924,6 +977,9 @@
 553                 basic_machine=sh-hitachi
 554                 os=-hms
 555                 ;;
 556 +       sh5el)
 557 +               basic_machine=sh5le-unknown
 558 +               ;;
 559         sh64)
 560                 basic_machine=sh64-unknown
 561                 ;;
 562 @@ -1013,6 +1069,10 @@
 563                 basic_machine=tic6x-unknown
 564                 os=-coff
 565                 ;;
 566 +       tile*)
 567 +               basic_machine=tile-unknown
 568 +               os=-linux-gnu
 569 +               ;;
 570         tx39)
 571                 basic_machine=mipstx39-unknown
 572                 ;;
 573 @@ -1088,6 +1148,10 @@
 574                 basic_machine=z8k-unknown
 575                 os=-sim
 576                 ;;
 577 +       z80-*-coff)
 578 +               basic_machine=z80-unknown
 579 +               os=-sim
 580 +               ;;
 581         none)
 582                 basic_machine=none-none
 583                 os=-none
 584 @@ -1126,10 +1190,10 @@
 585         we32k)
 586                 basic_machine=we32k-att
 587                 ;;
 588 -       sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 589 +       sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 590                 basic_machine=sh-unknown
 591                 ;;
 592 -       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sparcv9v2)
 593 +       sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
 594                 basic_machine=sparc-sun
 595                 ;;
 596         cydra)
 597 @@ -1198,8 +1262,9 @@
 598         -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 599               | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 600               | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 601 +             | -kopensolaris* \
 602               | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 603 -             | -aos* \
 604 +             | -aos* | -aros* \
 605               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 606               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 607               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 608 @@ -1208,7 +1273,7 @@
 609               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 610               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 611               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 612 -             | -chorusos* | -chorusrdb* \
 613 +             | -chorusos* | -chorusrdb* | -cegcc* \
 614               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 615               | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 616               | -uxpv* | -beos* | -mpeix* | -udk* \
 617 @@ -1218,7 +1283,7 @@
 618               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 619               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 620               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 621 -             | -skyos* | -haiku* | -rdos*)
 622 +             | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 623         # Remember, each alternative MUST END IN *, to match a version number.
 624                 ;;
 625         -qnx*)
 626 @@ -1348,6 +1413,9 @@
 627         -zvmoe)
 628                 os=-zvmoe
 629                 ;;
 630 +       -dicos*)
 631 +               os=-dicos
 632 +               ;;
 633         -none)
 634                 ;;
 635         *)
 636 @@ -1370,6 +1438,12 @@
 637  # system, and we'll never get to this point.
 638
 639  case $basic_machine in
 640 +        score-*)
 641 +               os=-elf
 642 +               ;;
 643 +        spu-*)
 644 +               os=-elf
 645 +               ;;
 646         *-acorn)
 647                 os=-riscix1.2
 648                 ;;
 649 @@ -1379,9 +1453,9 @@
 650         arm*-semi)
 651                 os=-aout
 652                 ;;
 653 -    c4x-* | tic4x-*)
 654 -        os=-coff
 655 -        ;;
 656 +        c4x-* | tic4x-*)
 657 +               os=-coff
 658 +               ;;
 659         # This must come before the *-dec entry.
 660         pdp10-*)
 661                 os=-tops20
 662 @@ -1407,6 +1481,9 @@
 663         m68*-cisco)
 664                 os=-aout
 665                 ;;
 666 +        mep-*)
 667 +               os=-elf
 668 +               ;;
 669         mips*-cisco)
 670                 os=-elf
 671                 ;;