org.handhelds.familiar/packages/libtool/libtool-1.5/libtool15-update-configscripts.patch

   1 --- libtool-1.5/libltdl/config.sub.old  2003-04-14 18:29:34.000000000 -0400
   2 +++ libtool-1.5/libltdl/config.sub      2004-04-25 00:06:42.000000000 -0400
   3 @@ -3,7 +3,7 @@
   4  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
   5  #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
   6
   7 -timestamp='2003-02-03'
   8 +timestamp='2004-03-12'
   9
  10  # This file is (in principle) common to ALL GNU software.
  11  # The presence of a machine in this file suggests that SOME GNU software
  12 @@ -118,7 +118,8 @@
  13  # Here we must recognize all the valid KERNEL-OS combinations.
  14  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  15  case $maybe_os in
  16 -  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
  17 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
  18 +  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
  19      os=-$maybe_os
  20      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
  21      ;;
  22 @@ -228,14 +229,15 @@
  23         | a29k \
  24         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  25         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  26 +       | am33_2.0 \
  27         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
  28 -       | clipper \
  29 +       | c4x | clipper \
  30         | d10v | d30v | dlx | dsp16xx \
  31         | fr30 | frv \
  32         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  33         | i370 | i860 | i960 | ia64 \
  34 -       | ip2k \
  35 -       | m32r | m68000 | m68k | m88k | mcore \
  36 +       | ip2k | iq2000 \
  37 +       | m32r | m32rle | m68000 | m68k | m88k | mcore \
  38         | mips | mipsbe | mipseb | mipsel | mipsle \
  39         | mips16 \
  40         | mips64 | mips64el \
  41 @@ -247,6 +249,7 @@
  42         | mipsisa32 | mipsisa32el \
  43         | mipsisa32r2 | mipsisa32r2el \
  44         | mipsisa64 | mipsisa64el \
  45 +       | mipsisa64r2 | mipsisa64r2el \
  46         | mipsisa64sb1 | mipsisa64sb1el \
  47         | mipsisa64sr71k | mipsisa64sr71kel \
  48         | mipstx39 | mipstx39el \
  49 @@ -259,9 +262,9 @@
  50         | pyramid \
  51         | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
  52         | sh64 | sh64le \
  53 -       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
  54 +       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
  55         | strongarm \
  56 -       | tahoe | thumb | tic80 | tron \
  57 +       | tahoe | thumb | tic4x | tic80 | tron \
  58         | v850 | v850e \
  59         | we32k \
  60         | x86 | xscale | xstormy16 | xtensa \
  61 @@ -304,8 +307,8 @@
  62         | h8300-* | h8500-* \
  63         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  64         | i*86-* | i860-* | i960-* | ia64-* \
  65 -       | ip2k-* \
  66 -       | m32r-* \
  67 +       | ip2k-* | iq2000-* \
  68 +       | m32r-* | m32rle-* \
  69         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  70         | m88110-* | m88k-* | mcore-* \
  71         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  72 @@ -319,6 +322,7 @@
  73         | mipsisa32-* | mipsisa32el-* \
  74         | mipsisa32r2-* | mipsisa32r2el-* \
  75         | mipsisa64-* | mipsisa64el-* \
  76 +       | mipsisa64r2-* | mipsisa64r2el-* \
  77         | mipsisa64sb1-* | mipsisa64sb1el-* \
  78         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
  79         | mipstx39-* | mipstx39el-* \
  80 @@ -332,7 +336,7 @@
  81         | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
  82         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
  83         | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
  84 -       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
  85 +       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
  86         | tahoe-* | thumb-* \
  87         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  88         | tron-* \
  89 @@ -359,6 +363,9 @@
  90                 basic_machine=a29k-amd
  91                 os=-udi
  92                 ;;
  93 +       abacus)
  94 +               basic_machine=abacus-unknown
  95 +               ;;
  96         adobe68k)
  97                 basic_machine=m68010-adobe
  98                 os=-scout
  99 @@ -373,6 +380,12 @@
 100                 basic_machine=a29k-none
 101                 os=-bsd
 102                 ;;
 103 +       amd64)
 104 +               basic_machine=x86_64-pc
 105 +               ;;
 106 +       amd64-*)
 107 +               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 108 +               ;;
 109         amdahl)
 110                 basic_machine=580-amdahl
 111                 os=-sysv
 112 @@ -432,12 +445,20 @@
 113                 basic_machine=j90-cray
 114                 os=-unicos
 115                 ;;
 116 +       cr16c)
 117 +               basic_machine=cr16c-unknown
 118 +               os=-elf
 119 +               ;;
 120         crds | unos)
 121                 basic_machine=m68k-crds
 122                 ;;
 123         cris | cris-* | etrax*)
 124                 basic_machine=cris-axis
 125                 ;;
 126 +       crx)
 127 +               basic_machine=crx-unknown
 128 +               os=-elf
 129 +               ;;
 130         da30 | da30-*)
 131                 basic_machine=m68k-da30
 132                 ;;
 133 @@ -737,6 +758,10 @@
 134                 basic_machine=or32-unknown
 135                 os=-coff
 136                 ;;
 137 +       os400)
 138 +               basic_machine=powerpc-ibm
 139 +               os=-os400
 140 +               ;;
 141         OSE68000 | ose68000)
 142                 basic_machine=m68000-ericsson
 143                 os=-ose
 144 @@ -768,18 +793,24 @@
 145         pentiumpro | p6 | 6x86 | athlon | athlon_*)
 146                 basic_machine=i686-pc
 147                 ;;
 148 -       pentiumii | pentium2)
 149 +       pentiumii | pentium2 | pentiumiii | pentium3)
 150                 basic_machine=i686-pc
 151                 ;;
 152 +       pentium4)
 153 +               basic_machine=i786-pc
 154 +               ;;
 155         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 156                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 157                 ;;
 158         pentiumpro-* | p6-* | 6x86-* | athlon-*)
 159                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 160                 ;;
 161 -       pentiumii-* | pentium2-*)
 162 +       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 163                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 164                 ;;
 165 +       pentium4-*)
 166 +               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 167 +               ;;
 168         pn)
 169                 basic_machine=pn-gould
 170                 ;;
 171 @@ -838,6 +869,10 @@
 172         sb1el)
 173                 basic_machine=mipsisa64sb1el-unknown
 174                 ;;
 175 +       sei)
 176 +               basic_machine=mips-sei
 177 +               os=-seiux
 178 +               ;;
 179         sequent)
 180                 basic_machine=i386-sequent
 181                 ;;
 182 @@ -845,6 +880,9 @@
 183                 basic_machine=sh-hitachi
 184                 os=-hms
 185                 ;;
 186 +       sh64)
 187 +               basic_machine=sh64-unknown
 188 +               ;;
 189         sparclite-wrs | simso-wrs)
 190                 basic_machine=sparclite-wrs
 191                 os=-vxworks
 192 @@ -919,10 +957,6 @@
 193                 basic_machine=t90-cray
 194                 os=-unicos
 195                 ;;
 196 -        tic4x | c4x*)
 197 -               basic_machine=tic4x-unknown
 198 -               os=-coff
 199 -               ;;
 200         tic54x | c54x*)
 201                 basic_machine=tic54x-unknown
 202                 os=-coff
 203 @@ -948,6 +982,10 @@
 204         tower | tower-32)
 205                 basic_machine=m68k-ncr
 206                 ;;
 207 +       tpf)
 208 +               basic_machine=s390x-ibm
 209 +               os=-tpf
 210 +               ;;
 211         udi29k)
 212                 basic_machine=a29k-amd
 213                 os=-udi
 214 @@ -1043,7 +1081,7 @@
 215         sh64)
 216                 basic_machine=sh64-unknown
 217                 ;;
 218 -       sparc | sparcv9 | sparcv9b)
 219 +       sparc | sparcv8 | sparcv9 | sparcv9b)
 220                 basic_machine=sparc-sun
 221                 ;;
 222         cydra)
 223 @@ -1116,19 +1154,20 @@
 224               | -aos* \
 225               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 226               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 227 -             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
 228 -             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 229 +             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
 230 +             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 231 +             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 232               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 233               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 234               | -chorusos* | -chorusrdb* \
 235               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 236 -             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
 237 +             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 238               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 239               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 240               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 241               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 242               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 243 -             | -powermax* | -dnix* | -microbsd*)
 244 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 245         # Remember, each alternative MUST END IN *, to match a version number.
 246                 ;;
 247         -qnx*)
 248 @@ -1152,6 +1191,9 @@
 249         -mac*)
 250                 os=`echo $os | sed -e 's|mac|macos|'`
 251                 ;;
 252 +       -linux-dietlibc)
 253 +               os=-linux-dietlibc
 254 +               ;;
 255         -linux*)
 256                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
 257                 ;;
 258 @@ -1164,6 +1206,9 @@
 259         -opened*)
 260                 os=-openedition
 261                 ;;
 262 +        -os400*)
 263 +               os=-os400
 264 +               ;;
 265         -wince*)
 266                 os=-wince
 267                 ;;
 268 @@ -1185,6 +1230,9 @@
 269         -atheos*)
 270                 os=-atheos
 271                 ;;
 272 +       -syllable*)
 273 +               os=-syllable
 274 +               ;;
 275         -386bsd)
 276                 os=-bsd
 277                 ;;
 278 @@ -1207,6 +1255,9 @@
 279         -sinix*)
 280                 os=-sysv4
 281                 ;;
 282 +        -tpf*)
 283 +               os=-tpf
 284 +               ;;
 285         -triton*)
 286                 os=-sysv3
 287                 ;;
 288 @@ -1274,6 +1325,9 @@
 289         arm*-semi)
 290                 os=-aout
 291                 ;;
 292 +    c4x-* | tic4x-*)
 293 +        os=-coff
 294 +        ;;
 295         # This must come before the *-dec entry.
 296         pdp10-*)
 297                 os=-tops20
 298 @@ -1452,9 +1506,15 @@
 299                         -mvs* | -opened*)
 300                                 vendor=ibm
 301                                 ;;
 302 +                       -os400*)
 303 +                               vendor=ibm
 304 +                               ;;
 305                         -ptx*)
 306                                 vendor=sequent
 307                                 ;;
 308 +                       -tpf*)
 309 +                               vendor=ibm
 310 +                               ;;
 311                         -vxsim* | -vxworks* | -windiss*)
 312                                 vendor=wrs
 313                                 ;;
 314 --- libtool-1.5/libltdl/config.guess.old        2003-04-14 18:29:34.000000000 -0400
 315 +++ libtool-1.5/libltdl/config.guess    2004-04-25 00:06:42.000000000 -0400
 316 @@ -3,7 +3,7 @@
 317  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 318  #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 319
 320 -timestamp='2003-01-30'
 321 +timestamp='2004-03-12'
 322
 323  # This file is free software; you can redistribute it and/or modify it
 324  # under the terms of the GNU General Public License as published by
 325 @@ -106,6 +106,7 @@
 326  : ${TMPDIR=/tmp} ;
 327   { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 328   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 329 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 330   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 331  dummy=$tmp/dummy ;
 332  tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 333 @@ -196,12 +197,18 @@
 334         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 335         echo "${machine}-${os}${release}"
 336         exit 0 ;;
 337 +    amd64:OpenBSD:*:*)
 338 +       echo x86_64-unknown-openbsd${UNAME_RELEASE}
 339 +       exit 0 ;;
 340      amiga:OpenBSD:*:*)
 341         echo m68k-unknown-openbsd${UNAME_RELEASE}
 342         exit 0 ;;
 343      arc:OpenBSD:*:*)
 344         echo mipsel-unknown-openbsd${UNAME_RELEASE}
 345         exit 0 ;;
 346 +    cats:OpenBSD:*:*)
 347 +       echo arm-unknown-openbsd${UNAME_RELEASE}
 348 +       exit 0 ;;
 349      hp300:OpenBSD:*:*)
 350         echo m68k-unknown-openbsd${UNAME_RELEASE}
 351         exit 0 ;;
 352 @@ -220,6 +227,9 @@
 353      mvmeppc:OpenBSD:*:*)
 354         echo powerpc-unknown-openbsd${UNAME_RELEASE}
 355         exit 0 ;;
 356 +    pegasos:OpenBSD:*:*)
 357 +       echo powerpc-unknown-openbsd${UNAME_RELEASE}
 358 +       exit 0 ;;
 359      pmax:OpenBSD:*:*)
 360         echo mipsel-unknown-openbsd${UNAME_RELEASE}
 361         exit 0 ;;
 362 @@ -235,13 +245,24 @@
 363      *:OpenBSD:*:*)
 364         echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 365         exit 0 ;;
 366 -    *:MicroBSD:*:*)
 367 -       echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
 368 +    *:ekkoBSD:*:*)
 369 +       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 370 +       exit 0 ;;
 371 +    macppc:MirBSD:*:*)
 372 +       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 373 +       exit 0 ;;
 374 +    *:MirBSD:*:*)
 375 +       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 376         exit 0 ;;
 377      alpha:OSF1:*:*)
 378 -       if test $UNAME_RELEASE = "V4.0"; then
 379 +       case $UNAME_RELEASE in
 380 +       *4.0)
 381                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 382 -       fi
 383 +               ;;
 384 +       *5.*)
 385 +               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 386 +               ;;
 387 +       esac
 388         # According to Compaq, /usr/sbin/psrinfo has been available on
 389         # OSF/1 and Tru64 systems produced since 1995.  I hope that
 390         # covers most systems running today.  This code pipes the CPU
 391 @@ -279,11 +300,15 @@
 392             "EV7.9 (21364A)")
 393                 UNAME_MACHINE="alphaev79" ;;
 394         esac
 395 +       # A Pn.n version is a patched version.
 396         # A Vn.n version is a released version.
 397         # A Tn.n version is a released field test version.
 398         # A Xn.n version is an unreleased experimental baselevel.
 399         # 1.2 uses "1.2" for uname -r.
 400 -       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 401 +       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 402 +       exit 0 ;;
 403 +    Alpha*:OpenVMS:*:*)
 404 +       echo alpha-hp-vms
 405         exit 0 ;;
 406      Alpha\ *:Windows_NT*:*)
 407         # How do we know it's Interix rather than the generic POSIX subsystem?
 408 @@ -306,6 +331,9 @@
 409      *:OS/390:*:*)
 410         echo i370-ibm-openedition
 411         exit 0 ;;
 412 +    *:OS400:*:*)
 413 +        echo powerpc-ibm-os400
 414 +       exit 0 ;;
 415      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 416         echo arm-acorn-riscix${UNAME_RELEASE}
 417         exit 0;;
 418 @@ -323,6 +351,9 @@
 419      NILE*:*:*:dcosx)
 420         echo pyramid-pyramid-svr4
 421         exit 0 ;;
 422 +    DRS?6000:unix:4.0:6*)
 423 +       echo sparc-icl-nx6
 424 +       exit 0 ;;
 425      DRS?6000:UNIX_SV:4.2*:7*)
 426         case `/usr/bin/uname -p` in
 427             sparc) echo sparc-icl-nx7 && exit 0 ;;
 428 @@ -395,6 +426,9 @@
 429      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 430          echo m68k-unknown-mint${UNAME_RELEASE}
 431          exit 0 ;;
 432 +    m68k:machten:*:*)
 433 +       echo m68k-apple-machten${UNAME_RELEASE}
 434 +       exit 0 ;;
 435      powerpc:machten:*:*)
 436         echo powerpc-apple-machten${UNAME_RELEASE}
 437         exit 0 ;;
 438 @@ -730,7 +764,7 @@
 439         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 440         exit 0 ;;
 441      *:UNICOS/mp:*:*)
 442 -       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 443 +       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 444         exit 0 ;;
 445      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 446         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 447 @@ -738,6 +772,11 @@
 448          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 449          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 450          exit 0 ;;
 451 +    5000:UNIX_System_V:4.*:*)
 452 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 453 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 454 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 455 +       exit 0 ;;
 456      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 457         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 458         exit 0 ;;
 459 @@ -759,7 +798,10 @@
 460         #endif
 461  EOF
 462         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 463 -       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 464 +       # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
 465 +       # FreeBSD's kernel, but not the complete OS.
 466 +       case ${LIBC} in gnu) kernel_only='k' ;; esac
 467 +       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 468         exit 0 ;;
 469      i*:CYGWIN*:*)
 470         echo ${UNAME_MACHINE}-pc-cygwin
 471 @@ -770,8 +812,8 @@
 472      i*:PW*:*)
 473         echo ${UNAME_MACHINE}-pc-pw32
 474         exit 0 ;;
 475 -    x86:Interix*:3*)
 476 -       echo i586-pc-interix3
 477 +    x86:Interix*:[34]*)
 478 +       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 479         exit 0 ;;
 480      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 481         echo i${UNAME_MACHINE}-pc-mks
 482 @@ -792,17 +834,28 @@
 483         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 484         exit 0 ;;
 485      *:GNU:*:*)
 486 +       # the GNU system
 487         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 488         exit 0 ;;
 489 +    *:GNU/*:*:*)
 490 +       # other systems with GNU libc and userland
 491 +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 492 +       exit 0 ;;
 493      i*86:Minix:*:*)
 494         echo ${UNAME_MACHINE}-pc-minix
 495         exit 0 ;;
 496      arm*:Linux:*:*)
 497         echo ${UNAME_MACHINE}-unknown-linux-gnu
 498         exit 0 ;;
 499 +    cris:Linux:*:*)
 500 +       echo cris-axis-linux-gnu
 501 +       exit 0 ;;
 502      ia64:Linux:*:*)
 503         echo ${UNAME_MACHINE}-unknown-linux-gnu
 504         exit 0 ;;
 505 +    m32r*:Linux:*:*)
 506 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
 507 +       exit 0 ;;
 508      m68*:Linux:*:*)
 509         echo ${UNAME_MACHINE}-unknown-linux-gnu
 510         exit 0 ;;
 511 @@ -878,6 +931,9 @@
 512      s390:Linux:*:* | s390x:Linux:*:*)
 513         echo ${UNAME_MACHINE}-ibm-linux
 514         exit 0 ;;
 515 +    sh64*:Linux:*:*)
 516 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
 517 +       exit 0 ;;
 518      sh*:Linux:*:*)
 519         echo ${UNAME_MACHINE}-unknown-linux-gnu
 520         exit 0 ;;
 521 @@ -935,6 +991,9 @@
 522         LIBC=gnuaout
 523         #endif
 524         #endif
 525 +       #ifdef __dietlibc__
 526 +       LIBC=dietlibc
 527 +       #endif
 528  EOF
 529         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 530         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 531 @@ -965,6 +1024,9 @@
 532      i*86:atheos:*:*)
 533         echo ${UNAME_MACHINE}-unknown-atheos
 534         exit 0 ;;
 535 +       i*86:syllable:*:*)
 536 +       echo ${UNAME_MACHINE}-pc-syllable
 537 +       exit 0 ;;
 538      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 539         echo i386-unknown-lynxos${UNAME_RELEASE}
 540         exit 0 ;;
 541 @@ -1036,7 +1098,7 @@
 542         exit 0 ;;
 543      M68*:*:R3V[567]*:*)
 544         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
 545 -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
 546 +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 547         OS_REL=''
 548         test -r /etc/.relid \
 549         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 550 @@ -1151,7 +1213,7 @@
 551      *:QNX:*:4*)
 552         echo i386-pc-qnx
 553         exit 0 ;;
 554 -    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 555 +    NSR-?:NONSTOP_KERNEL:*:*)
 556         echo nsr-tandem-nsk${UNAME_RELEASE}
 557         exit 0 ;;
 558      *:NonStop-UX:*:*)
 559 @@ -1192,6 +1254,12 @@
 560      *:ITS:*:*)
 561         echo pdp10-unknown-its
 562         exit 0 ;;
 563 +    SEI:*:*:SEIUX)
 564 +        echo mips-sei-seiux${UNAME_RELEASE}
 565 +       exit 0 ;;
 566 +    *:DragonFly:*:*)
 567 +       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 568 +       exit 0 ;;
 569  esac
 570
 571  #echo '(No uname command or uname output not recognized.)' 1>&2
 572 --- libtool-1.5/config.guess.old        2003-04-14 18:31:53.000000000 -0400
 573 +++ libtool-1.5/config.guess    2004-04-24 22:45:02.000000000 -0400
 574 @@ -3,7 +3,7 @@
 575  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 576  #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 577
 578 -timestamp='2003-02-22'
 579 +timestamp='2004-03-12'
 580
 581  # This file is free software; you can redistribute it and/or modify it
 582  # under the terms of the GNU General Public License as published by
 583 @@ -106,6 +106,7 @@
 584  : ${TMPDIR=/tmp} ;
 585   { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
 586   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
 587 + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
 588   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
 589  dummy=$tmp/dummy ;
 590  tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
 591 @@ -196,12 +197,18 @@
 592         # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 593         echo "${machine}-${os}${release}"
 594         exit 0 ;;
 595 +    amd64:OpenBSD:*:*)
 596 +       echo x86_64-unknown-openbsd${UNAME_RELEASE}
 597 +       exit 0 ;;
 598      amiga:OpenBSD:*:*)
 599         echo m68k-unknown-openbsd${UNAME_RELEASE}
 600         exit 0 ;;
 601      arc:OpenBSD:*:*)
 602         echo mipsel-unknown-openbsd${UNAME_RELEASE}
 603         exit 0 ;;
 604 +    cats:OpenBSD:*:*)
 605 +       echo arm-unknown-openbsd${UNAME_RELEASE}
 606 +       exit 0 ;;
 607      hp300:OpenBSD:*:*)
 608         echo m68k-unknown-openbsd${UNAME_RELEASE}
 609         exit 0 ;;
 610 @@ -220,6 +227,9 @@
 611      mvmeppc:OpenBSD:*:*)
 612         echo powerpc-unknown-openbsd${UNAME_RELEASE}
 613         exit 0 ;;
 614 +    pegasos:OpenBSD:*:*)
 615 +       echo powerpc-unknown-openbsd${UNAME_RELEASE}
 616 +       exit 0 ;;
 617      pmax:OpenBSD:*:*)
 618         echo mipsel-unknown-openbsd${UNAME_RELEASE}
 619         exit 0 ;;
 620 @@ -235,10 +245,24 @@
 621      *:OpenBSD:*:*)
 622         echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 623         exit 0 ;;
 624 +    *:ekkoBSD:*:*)
 625 +       echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 626 +       exit 0 ;;
 627 +    macppc:MirBSD:*:*)
 628 +       echo powerppc-unknown-mirbsd${UNAME_RELEASE}
 629 +       exit 0 ;;
 630 +    *:MirBSD:*:*)
 631 +       echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 632 +       exit 0 ;;
 633      alpha:OSF1:*:*)
 634 -       if test $UNAME_RELEASE = "V4.0"; then
 635 +       case $UNAME_RELEASE in
 636 +       *4.0)
 637                 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 638 -       fi
 639 +               ;;
 640 +       *5.*)
 641 +               UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 642 +               ;;
 643 +       esac
 644         # According to Compaq, /usr/sbin/psrinfo has been available on
 645         # OSF/1 and Tru64 systems produced since 1995.  I hope that
 646         # covers most systems running today.  This code pipes the CPU
 647 @@ -276,11 +300,15 @@
 648             "EV7.9 (21364A)")
 649                 UNAME_MACHINE="alphaev79" ;;
 650         esac
 651 +       # A Pn.n version is a patched version.
 652         # A Vn.n version is a released version.
 653         # A Tn.n version is a released field test version.
 654         # A Xn.n version is an unreleased experimental baselevel.
 655         # 1.2 uses "1.2" for uname -r.
 656 -       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 657 +       echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 658 +       exit 0 ;;
 659 +    Alpha*:OpenVMS:*:*)
 660 +       echo alpha-hp-vms
 661         exit 0 ;;
 662      Alpha\ *:Windows_NT*:*)
 663         # How do we know it's Interix rather than the generic POSIX subsystem?
 664 @@ -303,6 +331,9 @@
 665      *:OS/390:*:*)
 666         echo i370-ibm-openedition
 667         exit 0 ;;
 668 +    *:OS400:*:*)
 669 +        echo powerpc-ibm-os400
 670 +       exit 0 ;;
 671      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 672         echo arm-acorn-riscix${UNAME_RELEASE}
 673         exit 0;;
 674 @@ -320,6 +351,9 @@
 675      NILE*:*:*:dcosx)
 676         echo pyramid-pyramid-svr4
 677         exit 0 ;;
 678 +    DRS?6000:unix:4.0:6*)
 679 +       echo sparc-icl-nx6
 680 +       exit 0 ;;
 681      DRS?6000:UNIX_SV:4.2*:7*)
 682         case `/usr/bin/uname -p` in
 683             sparc) echo sparc-icl-nx7 && exit 0 ;;
 684 @@ -392,6 +426,9 @@
 685      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 686          echo m68k-unknown-mint${UNAME_RELEASE}
 687          exit 0 ;;
 688 +    m68k:machten:*:*)
 689 +       echo m68k-apple-machten${UNAME_RELEASE}
 690 +       exit 0 ;;
 691      powerpc:machten:*:*)
 692         echo powerpc-apple-machten${UNAME_RELEASE}
 693         exit 0 ;;
 694 @@ -727,7 +764,7 @@
 695         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 696         exit 0 ;;
 697      *:UNICOS/mp:*:*)
 698 -       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 699 +       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 700         exit 0 ;;
 701      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 702         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 703 @@ -735,6 +772,11 @@
 704          FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 705          echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 706          exit 0 ;;
 707 +    5000:UNIX_System_V:4.*:*)
 708 +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
 709 +        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
 710 +        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 711 +       exit 0 ;;
 712      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 713         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 714         exit 0 ;;
 715 @@ -756,7 +798,10 @@
 716         #endif
 717  EOF
 718         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 719 -       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 720 +       # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
 721 +       # FreeBSD's kernel, but not the complete OS.
 722 +       case ${LIBC} in gnu) kernel_only='k' ;; esac
 723 +       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 724         exit 0 ;;
 725      i*:CYGWIN*:*)
 726         echo ${UNAME_MACHINE}-pc-cygwin
 727 @@ -767,8 +812,8 @@
 728      i*:PW*:*)
 729         echo ${UNAME_MACHINE}-pc-pw32
 730         exit 0 ;;
 731 -    x86:Interix*:3*)
 732 -       echo i586-pc-interix3
 733 +    x86:Interix*:[34]*)
 734 +       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 735         exit 0 ;;
 736      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 737         echo i${UNAME_MACHINE}-pc-mks
 738 @@ -789,17 +834,28 @@
 739         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 740         exit 0 ;;
 741      *:GNU:*:*)
 742 +       # the GNU system
 743         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 744         exit 0 ;;
 745 +    *:GNU/*:*:*)
 746 +       # other systems with GNU libc and userland
 747 +       echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 748 +       exit 0 ;;
 749      i*86:Minix:*:*)
 750         echo ${UNAME_MACHINE}-pc-minix
 751         exit 0 ;;
 752      arm*:Linux:*:*)
 753         echo ${UNAME_MACHINE}-unknown-linux-gnu
 754         exit 0 ;;
 755 +    cris:Linux:*:*)
 756 +       echo cris-axis-linux-gnu
 757 +       exit 0 ;;
 758      ia64:Linux:*:*)
 759         echo ${UNAME_MACHINE}-unknown-linux-gnu
 760         exit 0 ;;
 761 +    m32r*:Linux:*:*)
 762 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
 763 +       exit 0 ;;
 764      m68*:Linux:*:*)
 765         echo ${UNAME_MACHINE}-unknown-linux-gnu
 766         exit 0 ;;
 767 @@ -875,6 +931,9 @@
 768      s390:Linux:*:* | s390x:Linux:*:*)
 769         echo ${UNAME_MACHINE}-ibm-linux
 770         exit 0 ;;
 771 +    sh64*:Linux:*:*)
 772 +       echo ${UNAME_MACHINE}-unknown-linux-gnu
 773 +       exit 0 ;;
 774      sh*:Linux:*:*)
 775         echo ${UNAME_MACHINE}-unknown-linux-gnu
 776         exit 0 ;;
 777 @@ -932,6 +991,9 @@
 778         LIBC=gnuaout
 779         #endif
 780         #endif
 781 +       #ifdef __dietlibc__
 782 +       LIBC=dietlibc
 783 +       #endif
 784  EOF
 785         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
 786         test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 787 @@ -962,6 +1024,9 @@
 788      i*86:atheos:*:*)
 789         echo ${UNAME_MACHINE}-unknown-atheos
 790         exit 0 ;;
 791 +       i*86:syllable:*:*)
 792 +       echo ${UNAME_MACHINE}-pc-syllable
 793 +       exit 0 ;;
 794      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 795         echo i386-unknown-lynxos${UNAME_RELEASE}
 796         exit 0 ;;
 797 @@ -1033,7 +1098,7 @@
 798         exit 0 ;;
 799      M68*:*:R3V[567]*:*)
 800         test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
 801 -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0)
 802 +    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
 803         OS_REL=''
 804         test -r /etc/.relid \
 805         && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 806 @@ -1148,7 +1213,7 @@
 807      *:QNX:*:4*)
 808         echo i386-pc-qnx
 809         exit 0 ;;
 810 -    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
 811 +    NSR-?:NONSTOP_KERNEL:*:*)
 812         echo nsr-tandem-nsk${UNAME_RELEASE}
 813         exit 0 ;;
 814      *:NonStop-UX:*:*)
 815 @@ -1189,6 +1254,12 @@
 816      *:ITS:*:*)
 817         echo pdp10-unknown-its
 818         exit 0 ;;
 819 +    SEI:*:*:SEIUX)
 820 +        echo mips-sei-seiux${UNAME_RELEASE}
 821 +       exit 0 ;;
 822 +    *:DragonFly:*:*)
 823 +       echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 824 +       exit 0 ;;
 825  esac
 826
 827  #echo '(No uname command or uname output not recognized.)' 1>&2
 828 --- libtool-1.5/config.sub.old  2003-04-14 18:32:01.000000000 -0400
 829 +++ libtool-1.5/config.sub      2004-04-24 22:45:02.000000000 -0400
 830 @@ -3,7 +3,7 @@
 831  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 832  #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 833
 834 -timestamp='2003-02-22'
 835 +timestamp='2004-03-12'
 836
 837  # This file is (in principle) common to ALL GNU software.
 838  # The presence of a machine in this file suggests that SOME GNU software
 839 @@ -118,7 +118,8 @@
 840  # Here we must recognize all the valid KERNEL-OS combinations.
 841  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 842  case $maybe_os in
 843 -  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 844 +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
 845 +  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
 846      os=-$maybe_os
 847      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
 848      ;;
 849 @@ -228,14 +229,15 @@
 850         | a29k \
 851         | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 852         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 853 +       | am33_2.0 \
 854         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
 855 -       | clipper \
 856 +       | c4x | clipper \
 857         | d10v | d30v | dlx | dsp16xx \
 858         | fr30 | frv \
 859         | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 860         | i370 | i860 | i960 | ia64 \
 861 -       | ip2k \
 862 -       | m32r | m68000 | m68k | m88k | mcore \
 863 +       | ip2k | iq2000 \
 864 +       | m32r | m32rle | m68000 | m68k | m88k | mcore \
 865         | mips | mipsbe | mipseb | mipsel | mipsle \
 866         | mips16 \
 867         | mips64 | mips64el \
 868 @@ -247,6 +249,7 @@
 869         | mipsisa32 | mipsisa32el \
 870         | mipsisa32r2 | mipsisa32r2el \
 871         | mipsisa64 | mipsisa64el \
 872 +       | mipsisa64r2 | mipsisa64r2el \
 873         | mipsisa64sb1 | mipsisa64sb1el \
 874         | mipsisa64sr71k | mipsisa64sr71kel \
 875         | mipstx39 | mipstx39el \
 876 @@ -259,9 +262,9 @@
 877         | pyramid \
 878         | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 879         | sh64 | sh64le \
 880 -       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
 881 +       | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
 882         | strongarm \
 883 -       | tahoe | thumb | tic80 | tron \
 884 +       | tahoe | thumb | tic4x | tic80 | tron \
 885         | v850 | v850e \
 886         | we32k \
 887         | x86 | xscale | xstormy16 | xtensa \
 888 @@ -304,8 +307,8 @@
 889         | h8300-* | h8500-* \
 890         | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 891         | i*86-* | i860-* | i960-* | ia64-* \
 892 -       | ip2k-* \
 893 -       | m32r-* \
 894 +       | ip2k-* | iq2000-* \
 895 +       | m32r-* | m32rle-* \
 896         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 897         | m88110-* | m88k-* | mcore-* \
 898         | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 899 @@ -319,6 +322,7 @@
 900         | mipsisa32-* | mipsisa32el-* \
 901         | mipsisa32r2-* | mipsisa32r2el-* \
 902         | mipsisa64-* | mipsisa64el-* \
 903 +       | mipsisa64r2-* | mipsisa64r2el-* \
 904         | mipsisa64sb1-* | mipsisa64sb1el-* \
 905         | mipsisa64sr71k-* | mipsisa64sr71kel-* \
 906         | mipstx39-* | mipstx39el-* \
 907 @@ -332,7 +336,7 @@
 908         | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 909         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 910         | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
 911 -       | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 912 +       | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 913         | tahoe-* | thumb-* \
 914         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 915         | tron-* \
 916 @@ -359,6 +363,9 @@
 917                 basic_machine=a29k-amd
 918                 os=-udi
 919                 ;;
 920 +       abacus)
 921 +               basic_machine=abacus-unknown
 922 +               ;;
 923         adobe68k)
 924                 basic_machine=m68010-adobe
 925                 os=-scout
 926 @@ -373,6 +380,12 @@
 927                 basic_machine=a29k-none
 928                 os=-bsd
 929                 ;;
 930 +       amd64)
 931 +               basic_machine=x86_64-pc
 932 +               ;;
 933 +       amd64-*)
 934 +               basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
 935 +               ;;
 936         amdahl)
 937                 basic_machine=580-amdahl
 938                 os=-sysv
 939 @@ -432,12 +445,20 @@
 940                 basic_machine=j90-cray
 941                 os=-unicos
 942                 ;;
 943 +       cr16c)
 944 +               basic_machine=cr16c-unknown
 945 +               os=-elf
 946 +               ;;
 947         crds | unos)
 948                 basic_machine=m68k-crds
 949                 ;;
 950         cris | cris-* | etrax*)
 951                 basic_machine=cris-axis
 952                 ;;
 953 +       crx)
 954 +               basic_machine=crx-unknown
 955 +               os=-elf
 956 +               ;;
 957         da30 | da30-*)
 958                 basic_machine=m68k-da30
 959                 ;;
 960 @@ -737,6 +758,10 @@
 961                 basic_machine=or32-unknown
 962                 os=-coff
 963                 ;;
 964 +       os400)
 965 +               basic_machine=powerpc-ibm
 966 +               os=-os400
 967 +               ;;
 968         OSE68000 | ose68000)
 969                 basic_machine=m68000-ericsson
 970                 os=-ose
 971 @@ -768,18 +793,24 @@
 972         pentiumpro | p6 | 6x86 | athlon | athlon_*)
 973                 basic_machine=i686-pc
 974                 ;;
 975 -       pentiumii | pentium2)
 976 +       pentiumii | pentium2 | pentiumiii | pentium3)
 977                 basic_machine=i686-pc
 978                 ;;
 979 +       pentium4)
 980 +               basic_machine=i786-pc
 981 +               ;;
 982         pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 983                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
 984                 ;;
 985         pentiumpro-* | p6-* | 6x86-* | athlon-*)
 986                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 987                 ;;
 988 -       pentiumii-* | pentium2-*)
 989 +       pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 990                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
 991                 ;;
 992 +       pentium4-*)
 993 +               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 994 +               ;;
 995         pn)
 996                 basic_machine=pn-gould
 997                 ;;
 998 @@ -838,6 +869,10 @@
 999         sb1el)
1000                 basic_machine=mipsisa64sb1el-unknown
1001                 ;;
1002 +       sei)
1003 +               basic_machine=mips-sei
1004 +               os=-seiux
1005 +               ;;
1006         sequent)
1007                 basic_machine=i386-sequent
1008                 ;;
1009 @@ -845,6 +880,9 @@
1010                 basic_machine=sh-hitachi
1011                 os=-hms
1012                 ;;
1013 +       sh64)
1014 +               basic_machine=sh64-unknown
1015 +               ;;
1016         sparclite-wrs | simso-wrs)
1017                 basic_machine=sparclite-wrs
1018                 os=-vxworks
1019 @@ -919,10 +957,6 @@
1020                 basic_machine=t90-cray
1021                 os=-unicos
1022                 ;;
1023 -        tic4x | c4x*)
1024 -               basic_machine=tic4x-unknown
1025 -               os=-coff
1026 -               ;;
1027         tic54x | c54x*)
1028                 basic_machine=tic54x-unknown
1029                 os=-coff
1030 @@ -948,6 +982,10 @@
1031         tower | tower-32)
1032                 basic_machine=m68k-ncr
1033                 ;;
1034 +       tpf)
1035 +               basic_machine=s390x-ibm
1036 +               os=-tpf
1037 +               ;;
1038         udi29k)
1039                 basic_machine=a29k-amd
1040                 os=-udi
1041 @@ -1043,7 +1081,7 @@
1042         sh64)
1043                 basic_machine=sh64-unknown
1044                 ;;
1045 -       sparc | sparcv9 | sparcv9b)
1046 +       sparc | sparcv8 | sparcv9 | sparcv9b)
1047                 basic_machine=sparc-sun
1048                 ;;
1049         cydra)
1050 @@ -1116,19 +1154,20 @@
1051               | -aos* \
1052               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1053               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1054 -             | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
1055 -             | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1056 +             | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
1057 +             | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1058 +             | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1059               | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1060               | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1061               | -chorusos* | -chorusrdb* \
1062               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1063 -             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
1064 +             | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
1065               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1066               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1067               | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1068               | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1069               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1070 -             | -powermax* | -dnix*)
1071 +             | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
1072         # Remember, each alternative MUST END IN *, to match a version number.
1073                 ;;
1074         -qnx*)
1075 @@ -1152,6 +1191,9 @@
1076         -mac*)
1077                 os=`echo $os | sed -e 's|mac|macos|'`
1078                 ;;
1079 +       -linux-dietlibc)
1080 +               os=-linux-dietlibc
1081 +               ;;
1082         -linux*)
1083                 os=`echo $os | sed -e 's|linux|linux-gnu|'`
1084                 ;;
1085 @@ -1164,6 +1206,9 @@
1086         -opened*)
1087                 os=-openedition
1088                 ;;
1089 +        -os400*)
1090 +               os=-os400
1091 +               ;;
1092         -wince*)
1093                 os=-wince
1094                 ;;
1095 @@ -1185,6 +1230,9 @@
1096         -atheos*)
1097                 os=-atheos
1098                 ;;
1099 +       -syllable*)
1100 +               os=-syllable
1101 +               ;;
1102         -386bsd)
1103                 os=-bsd
1104                 ;;
1105 @@ -1207,6 +1255,9 @@
1106         -sinix*)
1107                 os=-sysv4
1108                 ;;
1109 +        -tpf*)
1110 +               os=-tpf
1111 +               ;;
1112         -triton*)
1113                 os=-sysv3
1114                 ;;
1115 @@ -1274,6 +1325,9 @@
1116         arm*-semi)
1117                 os=-aout
1118                 ;;
1119 +    c4x-* | tic4x-*)
1120 +        os=-coff
1121 +        ;;
1122         # This must come before the *-dec entry.
1123         pdp10-*)
1124                 os=-tops20
1125 @@ -1452,9 +1506,15 @@
1126                         -mvs* | -opened*)
1127                                 vendor=ibm
1128                                 ;;
1129 +                       -os400*)
1130 +                               vendor=ibm
1131 +                               ;;
1132                         -ptx*)
1133                                 vendor=sequent
1134                                 ;;
1135 +                       -tpf*)
1136 +                               vendor=ibm
1137 +                               ;;
1138                         -vxsim* | -vxworks* | -windiss*)
1139                                 vendor=wrs
1140                                 ;;