| [617118d] | 1 | diff -uNr alsa-tools-1.0.8/ac3dec/config.guess alsa-tools-1.0.8-mod/ac3dec/config.guess | 
|---|
|  | 2 | --- alsa-tools-1.0.8/ac3dec/config.guess        2005-01-13 21:16:53.000000000 +1100 | 
|---|
|  | 3 | +++ alsa-tools-1.0.8-mod/ac3dec/config.guess    2005-01-27 17:31:54.523864381 +1100 | 
|---|
|  | 4 | @@ -1,9 +1,9 @@ | 
|---|
|  | 5 | #! /bin/sh | 
|---|
|  | 6 | # Attempt to guess a canonical system name. | 
|---|
|  | 7 | -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | 
|---|
|  | 8 | -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc. | 
|---|
|  | 9 | +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | 
|---|
|  | 10 | +#   Free Software Foundation, Inc. | 
|---|
|  | 11 |  | 
|---|
|  | 12 | -timestamp='2003-07-02' | 
|---|
|  | 13 | +timestamp='2001-09-04' | 
|---|
|  | 14 |  | 
|---|
|  | 15 | # This file is free software; you can redistribute it and/or modify it | 
|---|
|  | 16 | # under the terms of the GNU General Public License as published by | 
|---|
|  | 17 | @@ -24,9 +24,8 @@ | 
|---|
|  | 18 | # configuration script generated by Autoconf, you may include it under | 
|---|
|  | 19 | # the same distribution terms that you use for the rest of that program. | 
|---|
|  | 20 |  | 
|---|
|  | 21 | -# Originally written by Per Bothner <per@bothner.com>. | 
|---|
|  | 22 | -# Please send patches to <config-patches@gnu.org>.  Submit a context | 
|---|
|  | 23 | -# diff and a properly formatted ChangeLog entry. | 
|---|
|  | 24 | +# Written by Per Bothner <bothner@cygnus.com>. | 
|---|
|  | 25 | +# Please send patches to <config-patches@gnu.org>. | 
|---|
|  | 26 | # | 
|---|
|  | 27 | # This script attempts to guess a canonical system name similar to | 
|---|
|  | 28 | # config.sub.  If it succeeds, it prints the system name on stdout, and | 
|---|
|  | 29 | @@ -88,42 +87,30 @@ | 
|---|
|  | 30 | exit 1 | 
|---|
|  | 31 | fi | 
|---|
|  | 32 |  | 
|---|
|  | 33 | -trap 'exit 1' 1 2 15 | 
|---|
|  | 34 |  | 
|---|
|  | 35 | -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a | 
|---|
|  | 36 | -# compiler to aid in system detection is discouraged as it requires | 
|---|
|  | 37 | -# temporary files to be created and, as you can see below, it is a | 
|---|
|  | 38 | -# headache to deal with in a portable fashion. | 
|---|
|  | 39 | +dummy=dummy-$$ | 
|---|
|  | 40 | +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 | 
|---|
|  | 41 |  | 
|---|
|  | 42 | +# CC_FOR_BUILD -- compiler used by this script. | 
|---|
|  | 43 | # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still | 
|---|
|  | 44 | # use `HOST_CC' if defined, but it is deprecated. | 
|---|
|  | 45 |  | 
|---|
|  | 46 | -# Portable tmp directory creation inspired by the Autoconf team. | 
|---|
|  | 47 | - | 
|---|
|  | 48 | -set_cc_for_build=' | 
|---|
|  | 49 | -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; | 
|---|
|  | 50 | -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; | 
|---|
|  | 51 | -: ${TMPDIR=/tmp} ; | 
|---|
|  | 52 | - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || | 
|---|
|  | 53 | - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || | 
|---|
|  | 54 | - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || | 
|---|
|  | 55 | - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; | 
|---|
|  | 56 | -dummy=$tmp/dummy ; | 
|---|
|  | 57 | -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | 
|---|
|  | 58 | -case $CC_FOR_BUILD,$HOST_CC,$CC in | 
|---|
|  | 59 | - ,,)    echo "int x;" > $dummy.c ; | 
|---|
|  | 60 | -       for c in cc gcc c89 c99 ; do | 
|---|
|  | 61 | -         if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | 
|---|
|  | 62 | +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in | 
|---|
|  | 63 | + ,,)    echo "int dummy(){}" > $dummy.c ; | 
|---|
|  | 64 | +       for c in cc gcc c89 ; do | 
|---|
|  | 65 | +         ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; | 
|---|
|  | 66 | +         if test $? = 0 ; then | 
|---|
|  | 67 | CC_FOR_BUILD="$c"; break ; | 
|---|
|  | 68 | fi ; | 
|---|
|  | 69 | done ; | 
|---|
|  | 70 | +       rm -f $dummy.c $dummy.o $dummy.rel ; | 
|---|
|  | 71 | if test x"$CC_FOR_BUILD" = x ; then | 
|---|
|  | 72 | CC_FOR_BUILD=no_compiler_found ; | 
|---|
|  | 73 | fi | 
|---|
|  | 74 | ;; | 
|---|
|  | 75 | ,,*)   CC_FOR_BUILD=$CC ;; | 
|---|
|  | 76 | ,*,*)  CC_FOR_BUILD=$HOST_CC ;; | 
|---|
|  | 77 | -esac ;' | 
|---|
|  | 78 | +esac' | 
|---|
|  | 79 |  | 
|---|
|  | 80 | # This is needed to find uname on a Pyramid OSx when run in the BSD universe. | 
|---|
|  | 81 | # (ghazi@noc.rutgers.edu 1994-08-24) | 
|---|
|  | 82 | @@ -136,44 +123,33 @@ | 
|---|
|  | 83 | UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown | 
|---|
|  | 84 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | 
|---|
|  | 85 |  | 
|---|
|  | 86 | -case "${UNAME_MACHINE}" in | 
|---|
|  | 87 | -    i?86) | 
|---|
|  | 88 | -       test -z "$VENDOR" && VENDOR=pc | 
|---|
|  | 89 | -       ;; | 
|---|
|  | 90 | -    *) | 
|---|
|  | 91 | -       test -z "$VENDOR" && VENDOR=unknown | 
|---|
|  | 92 | -       ;; | 
|---|
|  | 93 | -esac | 
|---|
|  | 94 | -test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse | 
|---|
|  | 95 | - | 
|---|
|  | 96 | # Note: order is significant - the case branches are not exclusive. | 
|---|
|  | 97 |  | 
|---|
|  | 98 | case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | 
|---|
|  | 99 | *:NetBSD:*:*) | 
|---|
|  | 100 | -       # NetBSD (nbsd) targets should (where applicable) match one or | 
|---|
|  | 101 | +       # Netbsd (nbsd) targets should (where applicable) match one or | 
|---|
|  | 102 | # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, | 
|---|
|  | 103 | # *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently | 
|---|
|  | 104 | # switched to ELF, *-*-netbsd* would select the old | 
|---|
|  | 105 | # object file format.  This provides both forward | 
|---|
|  | 106 | # compatibility and a consistent mechanism for selecting the | 
|---|
|  | 107 | # object file format. | 
|---|
|  | 108 | -       # | 
|---|
|  | 109 | -       # Note: NetBSD doesn't particularly care about the vendor | 
|---|
|  | 110 | -       # portion of the name.  We always set it to "unknown". | 
|---|
|  | 111 | -       sysctl="sysctl -n hw.machine_arch" | 
|---|
|  | 112 | -       UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ | 
|---|
|  | 113 | -           /usr/sbin/$sysctl 2>/dev/null || echo unknown)` | 
|---|
|  | 114 | -       case "${UNAME_MACHINE_ARCH}" in | 
|---|
|  | 115 | -           armeb) machine=armeb-unknown ;; | 
|---|
|  | 116 | -           arm*) machine=arm-unknown ;; | 
|---|
|  | 117 | -           sh3el) machine=shl-unknown ;; | 
|---|
|  | 118 | -           sh3eb) machine=sh-unknown ;; | 
|---|
|  | 119 | -           *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | 
|---|
|  | 120 | +       # Determine the machine/vendor (is the vendor relevant). | 
|---|
|  | 121 | +       case "${UNAME_MACHINE}" in | 
|---|
|  | 122 | +           amiga) machine=m68k-unknown ;; | 
|---|
|  | 123 | +           arm32) machine=arm-unknown ;; | 
|---|
|  | 124 | +           atari*) machine=m68k-atari ;; | 
|---|
|  | 125 | +           sun3*) machine=m68k-sun ;; | 
|---|
|  | 126 | +           mac68k) machine=m68k-apple ;; | 
|---|
|  | 127 | +           macppc) machine=powerpc-apple ;; | 
|---|
|  | 128 | +           hp3[0-9][05]) machine=m68k-hp ;; | 
|---|
|  | 129 | +           ibmrt|romp-ibm) machine=romp-ibm ;; | 
|---|
|  | 130 | +           *) machine=${UNAME_MACHINE}-unknown ;; | 
|---|
|  | 131 | esac | 
|---|
|  | 132 | # The Operating System including object format, if it has switched | 
|---|
|  | 133 | # to ELF recently, or will in the future. | 
|---|
|  | 134 | -       case "${UNAME_MACHINE_ARCH}" in | 
|---|
|  | 135 | -           arm*|i386|m68k|ns32k|sh3*|sparc|vax) | 
|---|
|  | 136 | +       case "${UNAME_MACHINE}" in | 
|---|
|  | 137 | +           i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) | 
|---|
|  | 138 | eval $set_cc_for_build | 
|---|
|  | 139 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | 
|---|
|  | 140 | | grep __ELF__ >/dev/null | 
|---|
|  | 141 | @@ -190,112 +166,75 @@ | 
|---|
|  | 142 | ;; | 
|---|
|  | 143 | esac | 
|---|
|  | 144 | # The OS release | 
|---|
|  | 145 | -       # Debian GNU/NetBSD machines have a different userland, and | 
|---|
|  | 146 | -       # thus, need a distinct triplet. However, they do not need | 
|---|
|  | 147 | -       # kernel version information, so it can be replaced with a | 
|---|
|  | 148 | -       # suitable tag, in the style of linux-gnu. | 
|---|
|  | 149 | -       case "${UNAME_VERSION}" in | 
|---|
|  | 150 | -           Debian*) | 
|---|
|  | 151 | -               release='-gnu' | 
|---|
|  | 152 | -               ;; | 
|---|
|  | 153 | -           *) | 
|---|
|  | 154 | -               release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | 
|---|
|  | 155 | -               ;; | 
|---|
|  | 156 | -       esac | 
|---|
|  | 157 | +       release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | 
|---|
|  | 158 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | 
|---|
|  | 159 | # contains redundant information, the shorter form: | 
|---|
|  | 160 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | 
|---|
|  | 161 | echo "${machine}-${os}${release}" | 
|---|
|  | 162 | exit 0 ;; | 
|---|
|  | 163 | -    amiga:OpenBSD:*:*) | 
|---|
|  | 164 | -       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 165 | -       exit 0 ;; | 
|---|
|  | 166 | -    arc:OpenBSD:*:*) | 
|---|
|  | 167 | -       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 168 | -       exit 0 ;; | 
|---|
|  | 169 | -    hp300:OpenBSD:*:*) | 
|---|
|  | 170 | -       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 171 | -       exit 0 ;; | 
|---|
|  | 172 | -    mac68k:OpenBSD:*:*) | 
|---|
|  | 173 | -       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 174 | -       exit 0 ;; | 
|---|
|  | 175 | -    macppc:OpenBSD:*:*) | 
|---|
|  | 176 | -       echo powerpc-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 177 | -       exit 0 ;; | 
|---|
|  | 178 | -    mvme68k:OpenBSD:*:*) | 
|---|
|  | 179 | -       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 180 | -       exit 0 ;; | 
|---|
|  | 181 | -    mvme88k:OpenBSD:*:*) | 
|---|
|  | 182 | -       echo m88k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 183 | -       exit 0 ;; | 
|---|
|  | 184 | -    mvmeppc:OpenBSD:*:*) | 
|---|
|  | 185 | -       echo powerpc-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 186 | -       exit 0 ;; | 
|---|
|  | 187 | -    pmax:OpenBSD:*:*) | 
|---|
|  | 188 | -       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 189 | -       exit 0 ;; | 
|---|
|  | 190 | -    sgi:OpenBSD:*:*) | 
|---|
|  | 191 | -       echo mipseb-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 192 | -       exit 0 ;; | 
|---|
|  | 193 | -    sun3:OpenBSD:*:*) | 
|---|
|  | 194 | -       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 195 | -       exit 0 ;; | 
|---|
|  | 196 | -    wgrisc:OpenBSD:*:*) | 
|---|
|  | 197 | -       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 198 | -       exit 0 ;; | 
|---|
|  | 199 | -    *:OpenBSD:*:*) | 
|---|
|  | 200 | -       echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 201 | -       exit 0 ;; | 
|---|
|  | 202 | alpha:OSF1:*:*) | 
|---|
|  | 203 | if test $UNAME_RELEASE = "V4.0"; then | 
|---|
|  | 204 | UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | 
|---|
|  | 205 | fi | 
|---|
|  | 206 | -       # According to Compaq, /usr/sbin/psrinfo has been available on | 
|---|
|  | 207 | -       # OSF/1 and Tru64 systems produced since 1995.  I hope that | 
|---|
|  | 208 | -       # covers most systems running today.  This code pipes the CPU | 
|---|
|  | 209 | -       # types through head -n 1, so we only detect the type of CPU 0. | 
|---|
|  | 210 | -       ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1` | 
|---|
|  | 211 | -       case "$ALPHA_CPU_TYPE" in | 
|---|
|  | 212 | -           "EV4 (21064)") | 
|---|
|  | 213 | -               UNAME_MACHINE="alpha" ;; | 
|---|
|  | 214 | -           "EV4.5 (21064)") | 
|---|
|  | 215 | -               UNAME_MACHINE="alpha" ;; | 
|---|
|  | 216 | -           "LCA4 (21066/21068)") | 
|---|
|  | 217 | -               UNAME_MACHINE="alpha" ;; | 
|---|
|  | 218 | -           "EV5 (21164)") | 
|---|
|  | 219 | -               UNAME_MACHINE="alphaev5" ;; | 
|---|
|  | 220 | -           "EV5.6 (21164A)") | 
|---|
|  | 221 | -               UNAME_MACHINE="alphaev56" ;; | 
|---|
|  | 222 | -           "EV5.6 (21164PC)") | 
|---|
|  | 223 | -               UNAME_MACHINE="alphapca56" ;; | 
|---|
|  | 224 | -           "EV5.7 (21164PC)") | 
|---|
|  | 225 | -               UNAME_MACHINE="alphapca57" ;; | 
|---|
|  | 226 | -           "EV6 (21264)") | 
|---|
|  | 227 | -               UNAME_MACHINE="alphaev6" ;; | 
|---|
|  | 228 | -           "EV6.7 (21264A)") | 
|---|
|  | 229 | -               UNAME_MACHINE="alphaev67" ;; | 
|---|
|  | 230 | -           "EV6.8CB (21264C)") | 
|---|
|  | 231 | -               UNAME_MACHINE="alphaev68" ;; | 
|---|
|  | 232 | -           "EV6.8AL (21264B)") | 
|---|
|  | 233 | -               UNAME_MACHINE="alphaev68" ;; | 
|---|
|  | 234 | -           "EV6.8CX (21264D)") | 
|---|
|  | 235 | -               UNAME_MACHINE="alphaev68" ;; | 
|---|
|  | 236 | -           "EV6.9A (21264/EV69A)") | 
|---|
|  | 237 | -               UNAME_MACHINE="alphaev69" ;; | 
|---|
|  | 238 | -           "EV7 (21364)") | 
|---|
|  | 239 | -               UNAME_MACHINE="alphaev7" ;; | 
|---|
|  | 240 | -           "EV7.9 (21364A)") | 
|---|
|  | 241 | -               UNAME_MACHINE="alphaev79" ;; | 
|---|
|  | 242 | -       esac | 
|---|
|  | 243 | # A Vn.n version is a released version. | 
|---|
|  | 244 | # A Tn.n version is a released field test version. | 
|---|
|  | 245 | # A Xn.n version is an unreleased experimental baselevel. | 
|---|
|  | 246 | # 1.2 uses "1.2" for uname -r. | 
|---|
|  | 247 | +       cat <<EOF >$dummy.s | 
|---|
|  | 248 | +       .data | 
|---|
|  | 249 | +\$Lformat: | 
|---|
|  | 250 | +       .byte 37,100,45,37,120,10,0     # "%d-%x\n" | 
|---|
|  | 251 | + | 
|---|
|  | 252 | +       .text | 
|---|
|  | 253 | +       .globl main | 
|---|
|  | 254 | +       .align 4 | 
|---|
|  | 255 | +       .ent main | 
|---|
|  | 256 | +main: | 
|---|
|  | 257 | +       .frame \$30,16,\$26,0 | 
|---|
|  | 258 | +       ldgp \$29,0(\$27) | 
|---|
|  | 259 | +       .prologue 1 | 
|---|
|  | 260 | +       .long 0x47e03d80 # implver \$0 | 
|---|
|  | 261 | +       lda \$2,-1 | 
|---|
|  | 262 | +       .long 0x47e20c21 # amask \$2,\$1 | 
|---|
|  | 263 | +       lda \$16,\$Lformat | 
|---|
|  | 264 | +       mov \$0,\$17 | 
|---|
|  | 265 | +       not \$1,\$18 | 
|---|
|  | 266 | +       jsr \$26,printf | 
|---|
|  | 267 | +       ldgp \$29,0(\$26) | 
|---|
|  | 268 | +       mov 0,\$16 | 
|---|
|  | 269 | +       jsr \$26,exit | 
|---|
|  | 270 | +       .end main | 
|---|
|  | 271 | +EOF | 
|---|
|  | 272 | +       eval $set_cc_for_build | 
|---|
|  | 273 | +       $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null | 
|---|
|  | 274 | +       if test "$?" = 0 ; then | 
|---|
|  | 275 | +               case `./$dummy` in | 
|---|
|  | 276 | +                       0-0) | 
|---|
|  | 277 | +                               UNAME_MACHINE="alpha" | 
|---|
|  | 278 | +                               ;; | 
|---|
|  | 279 | +                       1-0) | 
|---|
|  | 280 | +                               UNAME_MACHINE="alphaev5" | 
|---|
|  | 281 | +                               ;; | 
|---|
|  | 282 | +                       1-1) | 
|---|
|  | 283 | +                               UNAME_MACHINE="alphaev56" | 
|---|
|  | 284 | +                               ;; | 
|---|
|  | 285 | +                       1-101) | 
|---|
|  | 286 | +                               UNAME_MACHINE="alphapca56" | 
|---|
|  | 287 | +                               ;; | 
|---|
|  | 288 | +                       2-303) | 
|---|
|  | 289 | +                               UNAME_MACHINE="alphaev6" | 
|---|
|  | 290 | +                               ;; | 
|---|
|  | 291 | +                       2-307) | 
|---|
|  | 292 | +                               UNAME_MACHINE="alphaev67" | 
|---|
|  | 293 | +                               ;; | 
|---|
|  | 294 | +                       2-1307) | 
|---|
|  | 295 | +                               UNAME_MACHINE="alphaev68" | 
|---|
|  | 296 | +                               ;; | 
|---|
|  | 297 | +               esac | 
|---|
|  | 298 | +       fi | 
|---|
|  | 299 | +       rm -f $dummy.s $dummy | 
|---|
|  | 300 | echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 
|---|
|  | 301 | exit 0 ;; | 
|---|
|  | 302 | -    Alpha*:OpenVMS:*:*) | 
|---|
|  | 303 | -       echo alpha-hp-vms | 
|---|
|  | 304 | -       exit 0 ;; | 
|---|
|  | 305 | Alpha\ *:Windows_NT*:*) | 
|---|
|  | 306 | # How do we know it's Interix rather than the generic POSIX subsystem? | 
|---|
|  | 307 | # Should we change UNAME_MACHINE based on the output of uname instead | 
|---|
|  | 308 | @@ -308,11 +247,29 @@ | 
|---|
|  | 309 | Amiga*:UNIX_System_V:4.0:*) | 
|---|
|  | 310 | echo m68k-unknown-sysv4 | 
|---|
|  | 311 | exit 0;; | 
|---|
|  | 312 | +    amiga:OpenBSD:*:*) | 
|---|
|  | 313 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 314 | +       exit 0 ;; | 
|---|
|  | 315 | *:[Aa]miga[Oo][Ss]:*:*) | 
|---|
|  | 316 | echo ${UNAME_MACHINE}-unknown-amigaos | 
|---|
|  | 317 | exit 0 ;; | 
|---|
|  | 318 | -    *:[Mm]orph[Oo][Ss]:*:*) | 
|---|
|  | 319 | -       echo ${UNAME_MACHINE}-unknown-morphos | 
|---|
|  | 320 | +    arc64:OpenBSD:*:*) | 
|---|
|  | 321 | +       echo mips64el-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 322 | +       exit 0 ;; | 
|---|
|  | 323 | +    arc:OpenBSD:*:*) | 
|---|
|  | 324 | +       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 325 | +       exit 0 ;; | 
|---|
|  | 326 | +    hkmips:OpenBSD:*:*) | 
|---|
|  | 327 | +       echo mips-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 328 | +       exit 0 ;; | 
|---|
|  | 329 | +    pmax:OpenBSD:*:*) | 
|---|
|  | 330 | +       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 331 | +       exit 0 ;; | 
|---|
|  | 332 | +    sgi:OpenBSD:*:*) | 
|---|
|  | 333 | +       echo mips-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 334 | +       exit 0 ;; | 
|---|
|  | 335 | +    wgrisc:OpenBSD:*:*) | 
|---|
|  | 336 | +       echo mipsel-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 337 | exit 0 ;; | 
|---|
|  | 338 | *:OS/390:*:*) | 
|---|
|  | 339 | echo i370-ibm-openedition | 
|---|
|  | 340 | @@ -334,13 +291,6 @@ | 
|---|
|  | 341 | NILE*:*:*:dcosx) | 
|---|
|  | 342 | echo pyramid-pyramid-svr4 | 
|---|
|  | 343 | exit 0 ;; | 
|---|
|  | 344 | -    DRS?6000:unix:4.0:6*) | 
|---|
|  | 345 | -       echo sparc-icl-nx6 | 
|---|
|  | 346 | -       exit 0 ;; | 
|---|
|  | 347 | -    DRS?6000:UNIX_SV:4.2*:7*) | 
|---|
|  | 348 | -       case `/usr/bin/uname -p` in | 
|---|
|  | 349 | -           sparc) echo sparc-icl-nx7 && exit 0 ;; | 
|---|
|  | 350 | -       esac ;; | 
|---|
|  | 351 | sun4H:SunOS:5.*:*) | 
|---|
|  | 352 | echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | 
|---|
|  | 353 | exit 0 ;; | 
|---|
|  | 354 | @@ -369,7 +319,7 @@ | 
|---|
|  | 355 | echo m68k-sun-sunos${UNAME_RELEASE} | 
|---|
|  | 356 | exit 0 ;; | 
|---|
|  | 357 | sun*:*:4.2BSD:*) | 
|---|
|  | 358 | -       UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 
|---|
|  | 359 | +       UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` | 
|---|
|  | 360 | test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 | 
|---|
|  | 361 | case "`/bin/arch`" in | 
|---|
|  | 362 | sun3) | 
|---|
|  | 363 | @@ -383,6 +333,12 @@ | 
|---|
|  | 364 | aushp:SunOS:*:*) | 
|---|
|  | 365 | echo sparc-auspex-sunos${UNAME_RELEASE} | 
|---|
|  | 366 | exit 0 ;; | 
|---|
|  | 367 | +    sparc*:NetBSD:*) | 
|---|
|  | 368 | +       echo `uname -p`-unknown-netbsd${UNAME_RELEASE} | 
|---|
|  | 369 | +       exit 0 ;; | 
|---|
|  | 370 | +    atari*:OpenBSD:*:*) | 
|---|
|  | 371 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 372 | +       exit 0 ;; | 
|---|
|  | 373 | # The situation for MiNT is a little confusing.  The machine name | 
|---|
|  | 374 | # can be virtually everything (everything which is not | 
|---|
|  | 375 | # "atarist" or "atariste" at least should have a processor | 
|---|
|  | 376 | @@ -409,6 +365,18 @@ | 
|---|
|  | 377 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | 
|---|
|  | 378 | echo m68k-unknown-mint${UNAME_RELEASE} | 
|---|
|  | 379 | exit 0 ;; | 
|---|
|  | 380 | +    sun3*:OpenBSD:*:*) | 
|---|
|  | 381 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 382 | +       exit 0 ;; | 
|---|
|  | 383 | +    mac68k:OpenBSD:*:*) | 
|---|
|  | 384 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 385 | +       exit 0 ;; | 
|---|
|  | 386 | +    mvme68k:OpenBSD:*:*) | 
|---|
|  | 387 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 388 | +       exit 0 ;; | 
|---|
|  | 389 | +    mvme88k:OpenBSD:*:*) | 
|---|
|  | 390 | +       echo m88k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 391 | +       exit 0 ;; | 
|---|
|  | 392 | powerpc:machten:*:*) | 
|---|
|  | 393 | echo powerpc-apple-machten${UNAME_RELEASE} | 
|---|
|  | 394 | exit 0 ;; | 
|---|
|  | 395 | @@ -447,20 +415,15 @@ | 
|---|
|  | 396 | exit (-1); | 
|---|
|  | 397 | } | 
|---|
|  | 398 | EOF | 
|---|
|  | 399 | -       $CC_FOR_BUILD -o $dummy $dummy.c \ | 
|---|
|  | 400 | -         && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ | 
|---|
|  | 401 | -         && exit 0 | 
|---|
|  | 402 | +       $CC_FOR_BUILD $dummy.c -o $dummy \ | 
|---|
|  | 403 | +         && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ | 
|---|
|  | 404 | +         && rm -f $dummy.c $dummy && exit 0 | 
|---|
|  | 405 | +       rm -f $dummy.c $dummy | 
|---|
|  | 406 | echo mips-mips-riscos${UNAME_RELEASE} | 
|---|
|  | 407 | exit 0 ;; | 
|---|
|  | 408 | Motorola:PowerMAX_OS:*:*) | 
|---|
|  | 409 | echo powerpc-motorola-powermax | 
|---|
|  | 410 | exit 0 ;; | 
|---|
|  | 411 | -    Motorola:*:4.3:PL8-*) | 
|---|
|  | 412 | -       echo powerpc-harris-powermax | 
|---|
|  | 413 | -       exit 0 ;; | 
|---|
|  | 414 | -    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) | 
|---|
|  | 415 | -       echo powerpc-harris-powermax | 
|---|
|  | 416 | -       exit 0 ;; | 
|---|
|  | 417 | Night_Hawk:Power_UNIX:*:*) | 
|---|
|  | 418 | echo powerpc-harris-powerunix | 
|---|
|  | 419 | exit 0 ;; | 
|---|
|  | 420 | @@ -533,7 +496,8 @@ | 
|---|
|  | 421 | exit(0); | 
|---|
|  | 422 | } | 
|---|
|  | 423 | EOF | 
|---|
|  | 424 | -               $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | 
|---|
|  | 425 | +               $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 | 
|---|
|  | 426 | +               rm -f $dummy.c $dummy | 
|---|
|  | 427 | echo rs6000-ibm-aix3.2.5 | 
|---|
|  | 428 | elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then | 
|---|
|  | 429 | echo rs6000-ibm-aix3.2.4 | 
|---|
|  | 430 | @@ -542,7 +506,7 @@ | 
|---|
|  | 431 | fi | 
|---|
|  | 432 | exit 0 ;; | 
|---|
|  | 433 | *:AIX:*:[45]) | 
|---|
|  | 434 | -       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` | 
|---|
|  | 435 | +       IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` | 
|---|
|  | 436 | if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then | 
|---|
|  | 437 | IBM_ARCH=rs6000 | 
|---|
|  | 438 | else | 
|---|
|  | 439 | @@ -582,8 +546,10 @@ | 
|---|
|  | 440 | 9000/31? )            HP_ARCH=m68000 ;; | 
|---|
|  | 441 | 9000/[34]?? )         HP_ARCH=m68k ;; | 
|---|
|  | 442 | 9000/[678][0-9][0-9]) | 
|---|
|  | 443 | -               if [ -x /usr/bin/getconf ]; then | 
|---|
|  | 444 | -                   sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 
|---|
|  | 445 | +              case "${HPUX_REV}" in | 
|---|
|  | 446 | +                11.[0-9][0-9]) | 
|---|
|  | 447 | +                  if [ -x /usr/bin/getconf ]; then | 
|---|
|  | 448 | +                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | 
|---|
|  | 449 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | 
|---|
|  | 450 | case "${sc_cpu_version}" in | 
|---|
|  | 451 | 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | 
|---|
|  | 452 | @@ -592,13 +558,13 @@ | 
|---|
|  | 453 | case "${sc_kernel_bits}" in | 
|---|
|  | 454 | 32) HP_ARCH="hppa2.0n" ;; | 
|---|
|  | 455 | 64) HP_ARCH="hppa2.0w" ;; | 
|---|
|  | 456 | -                         '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20 | 
|---|
|  | 457 | esac ;; | 
|---|
|  | 458 | esac | 
|---|
|  | 459 | -               fi | 
|---|
|  | 460 | -               if [ "${HP_ARCH}" = "" ]; then | 
|---|
|  | 461 | -                   eval $set_cc_for_build | 
|---|
|  | 462 | -                   sed 's/^              //' << EOF >$dummy.c | 
|---|
|  | 463 | +                  fi ;; | 
|---|
|  | 464 | +              esac | 
|---|
|  | 465 | +              if [ "${HP_ARCH}" = "" ]; then | 
|---|
|  | 466 | +             eval $set_cc_for_build | 
|---|
|  | 467 | +              sed 's/^              //' << EOF >$dummy.c | 
|---|
|  | 468 |  | 
|---|
|  | 469 | #define _HPUX_SOURCE | 
|---|
|  | 470 | #include <stdlib.h> | 
|---|
|  | 471 | @@ -631,21 +597,11 @@ | 
|---|
|  | 472 | exit (0); | 
|---|
|  | 473 | } | 
|---|
|  | 474 | EOF | 
|---|
|  | 475 | -                   (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` | 
|---|
|  | 476 | -                   test -z "$HP_ARCH" && HP_ARCH=hppa | 
|---|
|  | 477 | -               fi ;; | 
|---|
|  | 478 | +           (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` | 
|---|
|  | 479 | +           if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi | 
|---|
|  | 480 | +           rm -f $dummy.c $dummy | 
|---|
|  | 481 | +       fi ;; | 
|---|
|  | 482 | esac | 
|---|
|  | 483 | -       if [ ${HP_ARCH} = "hppa2.0w" ] | 
|---|
|  | 484 | -       then | 
|---|
|  | 485 | -           # avoid double evaluation of $set_cc_for_build | 
|---|
|  | 486 | -           test -n "$CC_FOR_BUILD" || eval $set_cc_for_build | 
|---|
|  | 487 | -           if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null | 
|---|
|  | 488 | -           then | 
|---|
|  | 489 | -               HP_ARCH="hppa2.0w" | 
|---|
|  | 490 | -           else | 
|---|
|  | 491 | -               HP_ARCH="hppa64" | 
|---|
|  | 492 | -           fi | 
|---|
|  | 493 | -       fi | 
|---|
|  | 494 | echo ${HP_ARCH}-hp-hpux${HPUX_REV} | 
|---|
|  | 495 | exit 0 ;; | 
|---|
|  | 496 | ia64:HP-UX:*:*) | 
|---|
|  | 497 | @@ -679,7 +635,8 @@ | 
|---|
|  | 498 | exit (0); | 
|---|
|  | 499 | } | 
|---|
|  | 500 | EOF | 
|---|
|  | 501 | -       $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | 
|---|
|  | 502 | +       $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 | 
|---|
|  | 503 | +       rm -f $dummy.c $dummy | 
|---|
|  | 504 | echo unknown-hitachi-hiuxwe2 | 
|---|
|  | 505 | exit 0 ;; | 
|---|
|  | 506 | 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) | 
|---|
|  | 507 | @@ -707,6 +664,9 @@ | 
|---|
|  | 508 | parisc*:Lites*:*:*) | 
|---|
|  | 509 | echo hppa1.1-hp-lites | 
|---|
|  | 510 | exit 0 ;; | 
|---|
|  | 511 | +    hppa*:OpenBSD:*:*) | 
|---|
|  | 512 | +       echo hppa-unknown-openbsd | 
|---|
|  | 513 | +       exit 0 ;; | 
|---|
|  | 514 | C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | 
|---|
|  | 515 | echo c1-convex-bsd | 
|---|
|  | 516 | exit 0 ;; | 
|---|
|  | 517 | @@ -725,6 +685,9 @@ | 
|---|
|  | 518 | C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | 
|---|
|  | 519 | echo c4-convex-bsd | 
|---|
|  | 520 | exit 0 ;; | 
|---|
|  | 521 | +    CRAY*X-MP:*:*:*) | 
|---|
|  | 522 | +       echo xmp-cray-unicos | 
|---|
|  | 523 | +        exit 0 ;; | 
|---|
|  | 524 | CRAY*Y-MP:*:*:*) | 
|---|
|  | 525 | echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 526 | exit 0 ;; | 
|---|
|  | 527 | @@ -737,21 +700,27 @@ | 
|---|
|  | 528 | CRAY*TS:*:*:*) | 
|---|
|  | 529 | echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 530 | exit 0 ;; | 
|---|
|  | 531 | +    CRAY*T3D:*:*:*) | 
|---|
|  | 532 | +       echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 533 | +       exit 0 ;; | 
|---|
|  | 534 | CRAY*T3E:*:*:*) | 
|---|
|  | 535 | echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 536 | exit 0 ;; | 
|---|
|  | 537 | CRAY*SV1:*:*:*) | 
|---|
|  | 538 | echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 539 | exit 0 ;; | 
|---|
|  | 540 | -    *:UNICOS/mp:*:*) | 
|---|
|  | 541 | -       echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | 
|---|
|  | 542 | -       exit 0 ;; | 
|---|
|  | 543 | +    CRAY-2:*:*:*) | 
|---|
|  | 544 | +       echo cray2-cray-unicos | 
|---|
|  | 545 | +        exit 0 ;; | 
|---|
|  | 546 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | 
|---|
|  | 547 | FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` | 
|---|
|  | 548 | FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` | 
|---|
|  | 549 | FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | 
|---|
|  | 550 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | 
|---|
|  | 551 | exit 0 ;; | 
|---|
|  | 552 | +    hp300:OpenBSD:*:*) | 
|---|
|  | 553 | +       echo m68k-unknown-openbsd${UNAME_RELEASE} | 
|---|
|  | 554 | +       exit 0 ;; | 
|---|
|  | 555 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | 
|---|
|  | 556 | echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | 
|---|
|  | 557 | exit 0 ;; | 
|---|
|  | 558 | @@ -761,22 +730,11 @@ | 
|---|
|  | 559 | *:BSD/OS:*:*) | 
|---|
|  | 560 | echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | 
|---|
|  | 561 | exit 0 ;; | 
|---|
|  | 562 | -    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*) | 
|---|
|  | 563 | -       # Determine whether the default compiler uses glibc. | 
|---|
|  | 564 | -       eval $set_cc_for_build | 
|---|
|  | 565 | -       sed 's/^        //' << EOF >$dummy.c | 
|---|
|  | 566 | -       #include <features.h> | 
|---|
|  | 567 | -       #if __GLIBC__ >= 2 | 
|---|
|  | 568 | -       LIBC=gnu | 
|---|
|  | 569 | -       #else | 
|---|
|  | 570 | -       LIBC= | 
|---|
|  | 571 | -       #endif | 
|---|
|  | 572 | -EOF | 
|---|
|  | 573 | -       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` | 
|---|
|  | 574 | -       # GNU/FreeBSD systems have a "k" prefix to indicate we are using | 
|---|
|  | 575 | -       # FreeBSD's kernel, but not the complete OS. | 
|---|
|  | 576 | -       case ${LIBC} in gnu) kernel_only='k' ;; esac | 
|---|
|  | 577 | -       echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} | 
|---|
|  | 578 | +    *:FreeBSD:*:*) | 
|---|
|  | 579 | +       echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` | 
|---|
|  | 580 | +       exit 0 ;; | 
|---|
|  | 581 | +    *:OpenBSD:*:*) | 
|---|
|  | 582 | +       echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | 
|---|
|  | 583 | exit 0 ;; | 
|---|
|  | 584 | i*:CYGWIN*:*) | 
|---|
|  | 585 | echo ${UNAME_MACHINE}-pc-cygwin | 
|---|
|  | 586 | @@ -787,17 +745,11 @@ | 
|---|
|  | 587 | i*:PW*:*) | 
|---|
|  | 588 | echo ${UNAME_MACHINE}-pc-pw32 | 
|---|
|  | 589 | exit 0 ;; | 
|---|
|  | 590 | -    x86:Interix*:[34]*) | 
|---|
|  | 591 | -       echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' | 
|---|
|  | 592 | -       exit 0 ;; | 
|---|
|  | 593 | -    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | 
|---|
|  | 594 | -       echo i${UNAME_MACHINE}-pc-mks | 
|---|
|  | 595 | -       exit 0 ;; | 
|---|
|  | 596 | i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | 
|---|
|  | 597 | # How do we know it's Interix rather than the generic POSIX subsystem? | 
|---|
|  | 598 | # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | 
|---|
|  | 599 | # UNAME_MACHINE based on the output of uname instead of i386? | 
|---|
|  | 600 | -       echo i586-pc-interix | 
|---|
|  | 601 | +       echo i386-pc-interix | 
|---|
|  | 602 | exit 0 ;; | 
|---|
|  | 603 | i*:UWIN*:*) | 
|---|
|  | 604 | echo ${UNAME_MACHINE}-pc-uwin | 
|---|
|  | 605 | @@ -815,60 +767,25 @@ | 
|---|
|  | 606 | echo ${UNAME_MACHINE}-pc-minix | 
|---|
|  | 607 | exit 0 ;; | 
|---|
|  | 608 | arm*:Linux:*:*) | 
|---|
|  | 609 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 610 | -       exit 0 ;; | 
|---|
|  | 611 | -    cris:Linux:*:*) | 
|---|
|  | 612 | -       echo cris-axis-linux | 
|---|
|  | 613 | +       echo ${UNAME_MACHINE}-unknown-linux-gnu | 
|---|
|  | 614 | exit 0 ;; | 
|---|
|  | 615 | ia64:Linux:*:*) | 
|---|
|  | 616 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 617 | +       echo ${UNAME_MACHINE}-unknown-linux | 
|---|
|  | 618 | exit 0 ;; | 
|---|
|  | 619 | m68*:Linux:*:*) | 
|---|
|  | 620 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 621 | +       echo ${UNAME_MACHINE}-unknown-linux-gnu | 
|---|
|  | 622 | exit 0 ;; | 
|---|
|  | 623 | mips:Linux:*:*) | 
|---|
|  | 624 | -       eval $set_cc_for_build | 
|---|
|  | 625 | -       sed 's/^        //' << EOF >$dummy.c | 
|---|
|  | 626 | -       #undef CPU | 
|---|
|  | 627 | -       #undef mips | 
|---|
|  | 628 | -       #undef mipsel | 
|---|
|  | 629 | -       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | 
|---|
|  | 630 | -       CPU=mipsel | 
|---|
|  | 631 | -       #else | 
|---|
|  | 632 | -       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | 
|---|
|  | 633 | -       CPU=mips | 
|---|
|  | 634 | -       #else | 
|---|
|  | 635 | -       CPU= | 
|---|
|  | 636 | -       #endif | 
|---|
|  | 637 | -       #endif | 
|---|
|  | 638 | -EOF | 
|---|
|  | 639 | -       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | 
|---|
|  | 640 | -       test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 | 
|---|
|  | 641 | -       ;; | 
|---|
|  | 642 | -    mips64:Linux:*:*) | 
|---|
|  | 643 | -       eval $set_cc_for_build | 
|---|
|  | 644 | -       sed 's/^        //' << EOF >$dummy.c | 
|---|
|  | 645 | -       #undef CPU | 
|---|
|  | 646 | -       #undef mips64 | 
|---|
|  | 647 | -       #undef mips64el | 
|---|
|  | 648 | -       #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) | 
|---|
|  | 649 | -       CPU=mips64el | 
|---|
|  | 650 | -       #else | 
|---|
|  | 651 | -       #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) | 
|---|
|  | 652 | -       CPU=mips64 | 
|---|
|  | 653 | -       #else | 
|---|
|  | 654 | -       CPU= | 
|---|
|  | 655 | -       #endif | 
|---|
|  | 656 | -       #endif | 
|---|
|  | 657 | -EOF | 
|---|
|  | 658 | -       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | 
|---|
|  | 659 | -       test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0 | 
|---|
|  | 660 | +       case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in | 
|---|
|  | 661 | +         big)    echo mips-unknown-linux-gnu && exit 0 ;; | 
|---|
|  | 662 | +         little) echo mipsel-unknown-linux-gnu && exit 0 ;; | 
|---|
|  | 663 | +       esac | 
|---|
|  | 664 | ;; | 
|---|
|  | 665 | ppc:Linux:*:*) | 
|---|
|  | 666 | -       echo powerpc-${VENDOR}-linux | 
|---|
|  | 667 | +       echo powerpc-unknown-linux-gnu | 
|---|
|  | 668 | exit 0 ;; | 
|---|
|  | 669 | ppc64:Linux:*:*) | 
|---|
|  | 670 | -       echo powerpc64-${VENDOR}-linux | 
|---|
|  | 671 | +       echo powerpc64-unknown-linux-gnu | 
|---|
|  | 672 | exit 0 ;; | 
|---|
|  | 673 | alpha:Linux:*:*) | 
|---|
|  | 674 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | 
|---|
|  | 675 | @@ -881,41 +798,37 @@ | 
|---|
|  | 676 | EV68*) UNAME_MACHINE=alphaev68 ;; | 
|---|
|  | 677 | esac | 
|---|
|  | 678 | objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | 
|---|
|  | 679 | -       if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi | 
|---|
|  | 680 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC} | 
|---|
|  | 681 | +       if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | 
|---|
|  | 682 | +       echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | 
|---|
|  | 683 | exit 0 ;; | 
|---|
|  | 684 | parisc:Linux:*:* | hppa:Linux:*:*) | 
|---|
|  | 685 | # Look for CPU level | 
|---|
|  | 686 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in | 
|---|
|  | 687 | -         PA7*) echo hppa1.1-${VENDOR}-linux ;; | 
|---|
|  | 688 | -         PA8*) echo hppa2.0-${VENDOR}-linux ;; | 
|---|
|  | 689 | -         *)    echo hppa-${VENDOR}-linux ;; | 
|---|
|  | 690 | +         PA7*) echo hppa1.1-unknown-linux-gnu ;; | 
|---|
|  | 691 | +         PA8*) echo hppa2.0-unknown-linux-gnu ;; | 
|---|
|  | 692 | +         *)    echo hppa-unknown-linux-gnu ;; | 
|---|
|  | 693 | esac | 
|---|
|  | 694 | exit 0 ;; | 
|---|
|  | 695 | parisc64:Linux:*:* | hppa64:Linux:*:*) | 
|---|
|  | 696 | -       echo hppa64-${VENDOR}-linux | 
|---|
|  | 697 | +       echo hppa64-unknown-linux-gnu | 
|---|
|  | 698 | exit 0 ;; | 
|---|
|  | 699 | s390:Linux:*:* | s390x:Linux:*:*) | 
|---|
|  | 700 | echo ${UNAME_MACHINE}-ibm-linux | 
|---|
|  | 701 | exit 0 ;; | 
|---|
|  | 702 | -    sh64*:Linux:*:*) | 
|---|
|  | 703 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 704 | -       exit 0 ;; | 
|---|
|  | 705 | sh*:Linux:*:*) | 
|---|
|  | 706 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 707 | +       echo ${UNAME_MACHINE}-unknown-linux-gnu | 
|---|
|  | 708 | exit 0 ;; | 
|---|
|  | 709 | sparc:Linux:*:* | sparc64:Linux:*:*) | 
|---|
|  | 710 | -       echo ${UNAME_MACHINE}-${VENDOR}-linux | 
|---|
|  | 711 | +       echo ${UNAME_MACHINE}-unknown-linux-gnu | 
|---|
|  | 712 | exit 0 ;; | 
|---|
|  | 713 | x86_64:Linux:*:*) | 
|---|
|  | 714 | -       echo x86_64-${VENDOR}-linux | 
|---|
|  | 715 | +       echo x86_64-unknown-linux-gnu | 
|---|
|  | 716 | exit 0 ;; | 
|---|
|  | 717 | i*86:Linux:*:*) | 
|---|
|  | 718 | # The BFD linker knows what the default object file format is, so | 
|---|
|  | 719 | # first see if it will tell us. cd to the root directory to prevent | 
|---|
|  | 720 | # problems with other programs or directories called `ld' in the path. | 
|---|
|  | 721 | -       # Set LC_ALL=C to ensure ld outputs messages in English. | 
|---|
|  | 722 | -       ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | 
|---|
|  | 723 | +       ld_supported_targets=`cd /; ld --help 2>&1 \ | 
|---|
|  | 724 | | sed -ne '/supported targets:/!d | 
|---|
|  | 725 | s/[         ][      ]*/ /g | 
|---|
|  | 726 | s/.*supported targets: *// | 
|---|
|  | 727 | @@ -923,44 +836,48 @@ | 
|---|
|  | 728 | p'` | 
|---|
|  | 729 | case "$ld_supported_targets" in | 
|---|
|  | 730 | elf32-i386) | 
|---|
|  | 731 | -               TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux" | 
|---|
|  | 732 | +               TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | 
|---|
|  | 733 | ;; | 
|---|
|  | 734 | a.out-i386-linux) | 
|---|
|  | 735 | -               echo "${UNAME_MACHINE}-${VENDOR}-linuxaout" | 
|---|
|  | 736 | -               exit 0 ;; | 
|---|
|  | 737 | +               echo "${UNAME_MACHINE}-pc-linux-gnuaout" | 
|---|
|  | 738 | +               exit 0 ;; | 
|---|
|  | 739 | coff-i386) | 
|---|
|  | 740 | -               echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff" | 
|---|
|  | 741 | +               echo "${UNAME_MACHINE}-pc-linux-gnucoff" | 
|---|
|  | 742 | exit 0 ;; | 
|---|
|  | 743 | "") | 
|---|
|  | 744 | -               # Either a pre-BFD a.out linker (linuxoldld) or | 
|---|
|  | 745 | +               # Either a pre-BFD a.out linker (linux-gnuoldld) or | 
|---|
|  | 746 | # one that does not give us useful --help. | 
|---|
|  | 747 | -               echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld" | 
|---|
|  | 748 | +               echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | 
|---|
|  | 749 | exit 0 ;; | 
|---|
|  | 750 | esac | 
|---|
|  | 751 | # Determine whether the default compiler is a.out or elf | 
|---|
|  | 752 | eval $set_cc_for_build | 
|---|
|  | 753 | -       sed 's/^        //' << EOF >$dummy.c | 
|---|
|  | 754 | -       #include <features.h> | 
|---|
|  | 755 | -       #ifdef __ELF__ | 
|---|
|  | 756 | -       # ifdef __GLIBC__ | 
|---|
|  | 757 | -       #  if __GLIBC__ >= 2 | 
|---|
|  | 758 | -       LIBC=gnu | 
|---|
|  | 759 | -       #  else | 
|---|
|  | 760 | -       LIBC=gnulibc1 | 
|---|
|  | 761 | -       #  endif | 
|---|
|  | 762 | -       # else | 
|---|
|  | 763 | -       LIBC=gnulibc1 | 
|---|
|  | 764 | -       # endif | 
|---|
|  | 765 | -       #else | 
|---|
|  | 766 | -       #ifdef __INTEL_COMPILER | 
|---|
|  | 767 | -       LIBC=gnu | 
|---|
|  | 768 | -       #else | 
|---|
|  | 769 | -       LIBC=gnuaout | 
|---|
|  | 770 | -       #endif | 
|---|
|  | 771 | -       #endif | 
|---|
|  | 772 | +       cat >$dummy.c <<EOF | 
|---|
|  | 773 | +#include <features.h> | 
|---|
|  | 774 | +#ifdef __cplusplus | 
|---|
|  | 775 | +#include <stdio.h>  /* for printf() prototype */ | 
|---|
|  | 776 | +       int main (int argc, char *argv[]) { | 
|---|
|  | 777 | +#else | 
|---|
|  | 778 | +       int main (argc, argv) int argc; char *argv[]; { | 
|---|
|  | 779 | +#endif | 
|---|
|  | 780 | +#ifdef __ELF__ | 
|---|
|  | 781 | +# ifdef __GLIBC__ | 
|---|
|  | 782 | +#  if __GLIBC__ >= 2 | 
|---|
|  | 783 | +    printf ("%s-pc-linux-gnu\n", argv[1]); | 
|---|
|  | 784 | +#  else | 
|---|
|  | 785 | +    printf ("%s-pc-linux-gnulibc1\n", argv[1]); | 
|---|
|  | 786 | +#  endif | 
|---|
|  | 787 | +# else | 
|---|
|  | 788 | +   printf ("%s-pc-linux-gnulibc1\n", argv[1]); | 
|---|
|  | 789 | +# endif | 
|---|
|  | 790 | +#else | 
|---|
|  | 791 | +  printf ("%s-pc-linux-gnuaout\n", argv[1]); | 
|---|
|  | 792 | +#endif | 
|---|
|  | 793 | +  return 0; | 
|---|
|  | 794 | +} | 
|---|
|  | 795 | EOF | 
|---|
|  | 796 | -       eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` | 
|---|
|  | 797 | -       test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0 | 
|---|
|  | 798 | +       $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 | 
|---|
|  | 799 | +       rm -f $dummy.c $dummy | 
|---|
|  | 800 | test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 | 
|---|
|  | 801 | ;; | 
|---|
|  | 802 | i*86:DYNIX/ptx:4*:*) | 
|---|
|  | 803 | @@ -977,23 +894,6 @@ | 
|---|
|  | 804 | # Use sysv4.2uw... so that sysv4* matches it. | 
|---|
|  | 805 | echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | 
|---|
|  | 806 | exit 0 ;; | 
|---|
|  | 807 | -    i*86:OS/2:*:*) | 
|---|
|  | 808 | -       # If we were able to find `uname', then EMX Unix compatibility | 
|---|
|  | 809 | -       # is probably installed. | 
|---|
|  | 810 | -       echo ${UNAME_MACHINE}-pc-os2-emx | 
|---|
|  | 811 | -       exit 0 ;; | 
|---|
|  | 812 | -    i*86:XTS-300:*:STOP) | 
|---|
|  | 813 | -       echo ${UNAME_MACHINE}-unknown-stop | 
|---|
|  | 814 | -       exit 0 ;; | 
|---|
|  | 815 | -    i*86:atheos:*:*) | 
|---|
|  | 816 | -       echo ${UNAME_MACHINE}-unknown-atheos | 
|---|
|  | 817 | -       exit 0 ;; | 
|---|
|  | 818 | -    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | 
|---|
|  | 819 | -       echo i386-unknown-lynxos${UNAME_RELEASE} | 
|---|
|  | 820 | -       exit 0 ;; | 
|---|
|  | 821 | -    i*86:*DOS:*:*) | 
|---|
|  | 822 | -       echo ${UNAME_MACHINE}-pc-msdosdjgpp | 
|---|
|  | 823 | -       exit 0 ;; | 
|---|
|  | 824 | i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) | 
|---|
|  | 825 | UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` | 
|---|
|  | 826 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then | 
|---|
|  | 827 | @@ -1015,19 +915,22 @@ | 
|---|
|  | 828 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` | 
|---|
|  | 829 | echo ${UNAME_MACHINE}-pc-isc$UNAME_REL | 
|---|
|  | 830 | elif /bin/uname -X 2>/dev/null >/dev/null ; then | 
|---|
|  | 831 | -               UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` | 
|---|
|  | 832 | -               (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 | 
|---|
|  | 833 | -               (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ | 
|---|
|  | 834 | +               UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` | 
|---|
|  | 835 | +               (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 | 
|---|
|  | 836 | +               (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ | 
|---|
|  | 837 | && UNAME_MACHINE=i586 | 
|---|
|  | 838 | -               (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ | 
|---|
|  | 839 | +               (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ | 
|---|
|  | 840 | && UNAME_MACHINE=i686 | 
|---|
|  | 841 | -               (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ | 
|---|
|  | 842 | +               (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ | 
|---|
|  | 843 | && UNAME_MACHINE=i686 | 
|---|
|  | 844 | echo ${UNAME_MACHINE}-pc-sco$UNAME_REL | 
|---|
|  | 845 | else | 
|---|
|  | 846 | echo ${UNAME_MACHINE}-pc-sysv32 | 
|---|
|  | 847 | fi | 
|---|
|  | 848 | exit 0 ;; | 
|---|
|  | 849 | +    i*86:*DOS:*:*) | 
|---|
|  | 850 | +       echo ${UNAME_MACHINE}-pc-msdosdjgpp | 
|---|
|  | 851 | +       exit 0 ;; | 
|---|
|  | 852 | pc:*:*:*) | 
|---|
|  | 853 | # Left here for compatibility: | 
|---|
|  | 854 | # uname -m prints for DJGPP always 'pc', but it prints nothing about | 
|---|
|  | 855 | @@ -1051,15 +954,9 @@ | 
|---|
|  | 856 | # "miniframe" | 
|---|
|  | 857 | echo m68010-convergent-sysv | 
|---|
|  | 858 | exit 0 ;; | 
|---|
|  | 859 | -    mc68k:UNIX:SYSTEM5:3.51m) | 
|---|
|  | 860 | -       echo m68k-convergent-sysv | 
|---|
|  | 861 | -       exit 0 ;; | 
|---|
|  | 862 | -    M680?0:D-NIX:5.3:*) | 
|---|
|  | 863 | -       echo m68k-diab-dnix | 
|---|
|  | 864 | -       exit 0 ;; | 
|---|
|  | 865 | M68*:*:R3V[567]*:*) | 
|---|
|  | 866 | test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; | 
|---|
|  | 867 | -    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 | SHG2:*:4.0:3.0) | 
|---|
|  | 868 | +    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) | 
|---|
|  | 869 | OS_REL='' | 
|---|
|  | 870 | test -r /etc/.relid \ | 
|---|
|  | 871 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | 
|---|
|  | 872 | @@ -1076,6 +973,9 @@ | 
|---|
|  | 873 | mc68030:UNIX_System_V:4.*:*) | 
|---|
|  | 874 | echo m68k-atari-sysv4 | 
|---|
|  | 875 | exit 0 ;; | 
|---|
|  | 876 | +    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | 
|---|
|  | 877 | +       echo i386-unknown-lynxos${UNAME_RELEASE} | 
|---|
|  | 878 | +       exit 0 ;; | 
|---|
|  | 879 | TSUNAMI:LynxOS:2.*:*) | 
|---|
|  | 880 | echo sparc-unknown-lynxos${UNAME_RELEASE} | 
|---|
|  | 881 | exit 0 ;; | 
|---|
|  | 882 | @@ -1147,9 +1047,6 @@ | 
|---|
|  | 883 | SX-5:SUPER-UX:*:*) | 
|---|
|  | 884 | echo sx5-nec-superux${UNAME_RELEASE} | 
|---|
|  | 885 | exit 0 ;; | 
|---|
|  | 886 | -    SX-6:SUPER-UX:*:*) | 
|---|
|  | 887 | -       echo sx6-nec-superux${UNAME_RELEASE} | 
|---|
|  | 888 | -       exit 0 ;; | 
|---|
|  | 889 | Power*:Rhapsody:*:*) | 
|---|
|  | 890 | echo powerpc-apple-rhapsody${UNAME_RELEASE} | 
|---|
|  | 891 | exit 0 ;; | 
|---|
|  | 892 | @@ -1157,24 +1054,18 @@ | 
|---|
|  | 893 | echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} | 
|---|
|  | 894 | exit 0 ;; | 
|---|
|  | 895 | *:Darwin:*:*) | 
|---|
|  | 896 | -       case `uname -p` in | 
|---|
|  | 897 | -           *86) UNAME_PROCESSOR=i686 ;; | 
|---|
|  | 898 | -           powerpc) UNAME_PROCESSOR=powerpc ;; | 
|---|
|  | 899 | -       esac | 
|---|
|  | 900 | -       echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | 
|---|
|  | 901 | +       echo `uname -p`-apple-darwin${UNAME_RELEASE} | 
|---|
|  | 902 | exit 0 ;; | 
|---|
|  | 903 | *:procnto*:*:* | *:QNX:[0123456789]*:*) | 
|---|
|  | 904 | -       UNAME_PROCESSOR=`uname -p` | 
|---|
|  | 905 | -       if test "$UNAME_PROCESSOR" = "x86"; then | 
|---|
|  | 906 | -               UNAME_PROCESSOR=i386 | 
|---|
|  | 907 | +       if test "${UNAME_MACHINE}" = "x86pc"; then | 
|---|
|  | 908 | UNAME_MACHINE=pc | 
|---|
|  | 909 | fi | 
|---|
|  | 910 | -       echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} | 
|---|
|  | 911 | +       echo `uname -p`-${UNAME_MACHINE}-nto-qnx | 
|---|
|  | 912 | exit 0 ;; | 
|---|
|  | 913 | *:QNX:*:4*) | 
|---|
|  | 914 | echo i386-pc-qnx | 
|---|
|  | 915 | exit 0 ;; | 
|---|
|  | 916 | -    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) | 
|---|
|  | 917 | +    NSR-[KW]:NONSTOP_KERNEL:*:*) | 
|---|
|  | 918 | echo nsr-tandem-nsk${UNAME_RELEASE} | 
|---|
|  | 919 | exit 0 ;; | 
|---|
|  | 920 | *:NonStop-UX:*:*) | 
|---|
|  | 921 | @@ -1197,6 +1088,11 @@ | 
|---|
|  | 922 | fi | 
|---|
|  | 923 | echo ${UNAME_MACHINE}-unknown-plan9 | 
|---|
|  | 924 | exit 0 ;; | 
|---|
|  | 925 | +    i*86:OS/2:*:*) | 
|---|
|  | 926 | +       # If we were able to find `uname', then EMX Unix compatibility | 
|---|
|  | 927 | +       # is probably installed. | 
|---|
|  | 928 | +       echo ${UNAME_MACHINE}-pc-os2-emx | 
|---|
|  | 929 | +       exit 0 ;; | 
|---|
|  | 930 | *:TOPS-10:*:*) | 
|---|
|  | 931 | echo pdp10-unknown-tops10 | 
|---|
|  | 932 | exit 0 ;; | 
|---|
|  | 933 | @@ -1215,8 +1111,11 @@ | 
|---|
|  | 934 | *:ITS:*:*) | 
|---|
|  | 935 | echo pdp10-unknown-its | 
|---|
|  | 936 | exit 0 ;; | 
|---|
|  | 937 | -    SEI:*:*:SEIUX) | 
|---|
|  | 938 | -        echo mips-sei-seiux${UNAME_RELEASE} | 
|---|
|  | 939 | +    i*86:XTS-300:*:STOP) | 
|---|
|  | 940 | +       echo ${UNAME_MACHINE}-unknown-stop | 
|---|
|  | 941 | +       exit 0 ;; | 
|---|
|  | 942 | +    i*86:atheos:*:*) | 
|---|
|  | 943 | +       echo ${UNAME_MACHINE}-unknown-atheos | 
|---|
|  | 944 | exit 0 ;; | 
|---|
|  | 945 | esac | 
|---|
|  | 946 |  | 
|---|
|  | 947 | @@ -1338,7 +1237,8 @@ | 
|---|
|  | 948 | } | 
|---|
|  | 949 | EOF | 
|---|
|  | 950 |  | 
|---|
|  | 951 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 | 
|---|
|  | 952 | +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 | 
|---|
|  | 953 | +rm -f $dummy.c $dummy | 
|---|
|  | 954 |  | 
|---|
|  | 955 | # Apollos put the system type in the environment. | 
|---|
|  | 956 |  | 
|---|
|  | 957 | diff -uNr alsa-tools-1.0.8/ac3dec/config.sub alsa-tools-1.0.8-mod/ac3dec/config.sub | 
|---|
|  | 958 | --- alsa-tools-1.0.8/ac3dec/config.sub  2001-04-18 05:43:24.000000000 +1000 | 
|---|
|  | 959 | +++ alsa-tools-1.0.8-mod/ac3dec/config.sub      2005-01-27 17:31:46.569766263 +1100 | 
|---|
|  | 960 | @@ -1,6 +1,10 @@ | 
|---|
|  | 961 | #! /bin/sh | 
|---|
|  | 962 | -# Configuration validation subroutine script, version 1.1. | 
|---|
|  | 963 | -#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. | 
|---|
|  | 964 | +# Configuration validation subroutine script. | 
|---|
|  | 965 | +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | 
|---|
|  | 966 | +#   Free Software Foundation, Inc. | 
|---|
|  | 967 | + | 
|---|
|  | 968 | +timestamp='2001-09-07' | 
|---|
|  | 969 | + | 
|---|
|  | 970 | # This file is (in principle) common to ALL GNU software. | 
|---|
|  | 971 | # The presence of a machine in this file suggests that SOME GNU software | 
|---|
|  | 972 | # can handle that machine.  It does not imply ALL GNU software can. | 
|---|
|  | 973 | @@ -25,6 +29,8 @@ | 
|---|
|  | 974 | # configuration script generated by Autoconf, you may include it under | 
|---|
|  | 975 | # the same distribution terms that you use for the rest of that program. | 
|---|
|  | 976 |  | 
|---|
|  | 977 | +# Please send patches to <config-patches@gnu.org>. | 
|---|
|  | 978 | +# | 
|---|
|  | 979 | # Configuration subroutine to validate and canonicalize a configuration type. | 
|---|
|  | 980 | # Supply the specified configuration type as an argument. | 
|---|
|  | 981 | # If it is invalid, we print an error message on stderr and exit with code 1. | 
|---|
|  | 982 | @@ -45,30 +51,73 @@ | 
|---|
|  | 983 | #      CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM | 
|---|
|  | 984 | # It is wrong to echo any other type of specification. | 
|---|
|  | 985 |  | 
|---|
|  | 986 | -if [ x$1 = x ] | 
|---|
|  | 987 | -then | 
|---|
|  | 988 | -       echo Configuration name missing. 1>&2 | 
|---|
|  | 989 | -       echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 | 
|---|
|  | 990 | -       echo "or     $0 ALIAS" 1>&2 | 
|---|
|  | 991 | -       echo where ALIAS is a recognized configuration type. 1>&2 | 
|---|
|  | 992 | -       exit 1 | 
|---|
|  | 993 | -fi | 
|---|
|  | 994 | +me=`echo "$0" | sed -e 's,.*/,,'` | 
|---|
|  | 995 |  | 
|---|
|  | 996 | -# First pass through any local machine types. | 
|---|
|  | 997 | -case $1 in | 
|---|
|  | 998 | -       *local*) | 
|---|
|  | 999 | -               echo $1 | 
|---|
|  | 1000 | -               exit 0 | 
|---|
|  | 1001 | -               ;; | 
|---|
|  | 1002 | -       *) | 
|---|
|  | 1003 | -       ;; | 
|---|
|  | 1004 | +usage="\ | 
|---|
|  | 1005 | +Usage: $0 [OPTION] CPU-MFR-OPSYS | 
|---|
|  | 1006 | +       $0 [OPTION] ALIAS | 
|---|
|  | 1007 | + | 
|---|
|  | 1008 | +Canonicalize a configuration name. | 
|---|
|  | 1009 | + | 
|---|
|  | 1010 | +Operation modes: | 
|---|
|  | 1011 | +  -h, --help         print this help, then exit | 
|---|
|  | 1012 | +  -t, --time-stamp   print date of last modification, then exit | 
|---|
|  | 1013 | +  -v, --version      print version number, then exit | 
|---|
|  | 1014 | + | 
|---|
|  | 1015 | +Report bugs and patches to <config-patches@gnu.org>." | 
|---|
|  | 1016 | + | 
|---|
|  | 1017 | +version="\ | 
|---|
|  | 1018 | +GNU config.sub ($timestamp) | 
|---|
|  | 1019 | + | 
|---|
|  | 1020 | +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | 
|---|
|  | 1021 | +Free Software Foundation, Inc. | 
|---|
|  | 1022 | + | 
|---|
|  | 1023 | +This is free software; see the source for copying conditions.  There is NO | 
|---|
|  | 1024 | +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." | 
|---|
|  | 1025 | + | 
|---|
|  | 1026 | +help=" | 
|---|
|  | 1027 | +Try \`$me --help' for more information." | 
|---|
|  | 1028 | + | 
|---|
|  | 1029 | +# Parse command line | 
|---|
|  | 1030 | +while test $# -gt 0 ; do | 
|---|
|  | 1031 | +  case $1 in | 
|---|
|  | 1032 | +    --time-stamp | --time* | -t ) | 
|---|
|  | 1033 | +       echo "$timestamp" ; exit 0 ;; | 
|---|
|  | 1034 | +    --version | -v ) | 
|---|
|  | 1035 | +       echo "$version" ; exit 0 ;; | 
|---|
|  | 1036 | +    --help | --h* | -h ) | 
|---|
|  | 1037 | +       echo "$usage"; exit 0 ;; | 
|---|
|  | 1038 | +    -- )     # Stop option processing | 
|---|
|  | 1039 | +       shift; break ;; | 
|---|
|  | 1040 | +    - )        # Use stdin as input. | 
|---|
|  | 1041 | +       break ;; | 
|---|
|  | 1042 | +    -* ) | 
|---|
|  | 1043 | +       echo "$me: invalid option $1$help" | 
|---|
|  | 1044 | +       exit 1 ;; | 
|---|
|  | 1045 | + | 
|---|
|  | 1046 | +    *local*) | 
|---|
|  | 1047 | +       # First pass through any local machine types. | 
|---|
|  | 1048 | +       echo $1 | 
|---|
|  | 1049 | +       exit 0;; | 
|---|
|  | 1050 | + | 
|---|
|  | 1051 | +    * ) | 
|---|
|  | 1052 | +       break ;; | 
|---|
|  | 1053 | +  esac | 
|---|
|  | 1054 | +done | 
|---|
|  | 1055 | + | 
|---|
|  | 1056 | +case $# in | 
|---|
|  | 1057 | + 0) echo "$me: missing argument$help" >&2 | 
|---|
|  | 1058 | +    exit 1;; | 
|---|
|  | 1059 | + 1) ;; | 
|---|
|  | 1060 | + *) echo "$me: too many arguments$help" >&2 | 
|---|
|  | 1061 | +    exit 1;; | 
|---|
|  | 1062 | esac | 
|---|
|  | 1063 |  | 
|---|
|  | 1064 | # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). | 
|---|
|  | 1065 | # Here we must recognize all the valid KERNEL-OS combinations. | 
|---|
|  | 1066 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | 
|---|
|  | 1067 | case $maybe_os in | 
|---|
|  | 1068 | -  linux-*) | 
|---|
|  | 1069 | +  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) | 
|---|
|  | 1070 | os=-$maybe_os | 
|---|
|  | 1071 | basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | 
|---|
|  | 1072 | ;; | 
|---|
|  | 1073 | @@ -94,7 +143,7 @@ | 
|---|
|  | 1074 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ | 
|---|
|  | 1075 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ | 
|---|
|  | 1076 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ | 
|---|
|  | 1077 | -       -apple) | 
|---|
|  | 1078 | +       -apple | -axis) | 
|---|
|  | 1079 | os= | 
|---|
|  | 1080 | basic_machine=$1 | 
|---|
|  | 1081 | ;; | 
|---|
|  | 1082 | @@ -108,6 +157,14 @@ | 
|---|
|  | 1083 | os=-vxworks | 
|---|
|  | 1084 | basic_machine=$1 | 
|---|
|  | 1085 | ;; | 
|---|
|  | 1086 | +       -chorusos*) | 
|---|
|  | 1087 | +               os=-chorusos | 
|---|
|  | 1088 | +               basic_machine=$1 | 
|---|
|  | 1089 | +               ;; | 
|---|
|  | 1090 | +       -chorusrdb) | 
|---|
|  | 1091 | +               os=-chorusrdb | 
|---|
|  | 1092 | +               basic_machine=$1 | 
|---|
|  | 1093 | +               ;; | 
|---|
|  | 1094 | -hiux*) | 
|---|
|  | 1095 | os=-hiuxwe2 | 
|---|
|  | 1096 | ;; | 
|---|
|  | 1097 | @@ -166,49 +223,51 @@ | 
|---|
|  | 1098 | case $basic_machine in | 
|---|
|  | 1099 | # Recognize the basic CPU types without company name. | 
|---|
|  | 1100 | # Some are omitted here because they have special meanings below. | 
|---|
|  | 1101 | -       tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ | 
|---|
|  | 1102 | -               | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ | 
|---|
|  | 1103 | -               | 580 | i960 | h8300 \ | 
|---|
|  | 1104 | -               | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | 
|---|
|  | 1105 | -               | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ | 
|---|
|  | 1106 | -               | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ | 
|---|
|  | 1107 | -               | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ | 
|---|
|  | 1108 | -               | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | 
|---|
|  | 1109 | -               | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ | 
|---|
|  | 1110 | -               | mips64vr5000 | miprs64vr5000el | mcore \ | 
|---|
|  | 1111 | -               | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ | 
|---|
|  | 1112 | -               | thumb | d10v | fr30) | 
|---|
|  | 1113 | +       1750a | 580 \ | 
|---|
|  | 1114 | +       | a29k \ | 
|---|
|  | 1115 | +       | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | 
|---|
|  | 1116 | +       | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | 
|---|
|  | 1117 | +       | c4x | clipper \ | 
|---|
|  | 1118 | +       | d10v | d30v | dsp16xx \ | 
|---|
|  | 1119 | +       | fr30 \ | 
|---|
|  | 1120 | +       | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | 
|---|
|  | 1121 | +       | i370 | i860 | i960 | ia64 \ | 
|---|
|  | 1122 | +       | m32r | m68000 | m68k | m88k | mcore \ | 
|---|
|  | 1123 | +       | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ | 
|---|
|  | 1124 | +       | mips64vr4100 | mips64vr4100el | mips64vr4300 \ | 
|---|
|  | 1125 | +       | mips64vr4300el | mips64vr5000 | mips64vr5000el \ | 
|---|
|  | 1126 | +       | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ | 
|---|
|  | 1127 | +       | mipsisa32 \ | 
|---|
|  | 1128 | +       | mn10200 | mn10300 \ | 
|---|
|  | 1129 | +       | ns16k | ns32k \ | 
|---|
|  | 1130 | +       | openrisc \ | 
|---|
|  | 1131 | +       | pdp10 | pdp11 | pj | pjl \ | 
|---|
|  | 1132 | +       | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | 
|---|
|  | 1133 | +       | pyramid \ | 
|---|
|  | 1134 | +       | s390 | s390x \ | 
|---|
|  | 1135 | +       | sh | sh[34] | sh[34]eb | shbe | shle \ | 
|---|
|  | 1136 | +       | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ | 
|---|
|  | 1137 | +       | stormy16 | strongarm \ | 
|---|
|  | 1138 | +       | tahoe | thumb | tic80 | tron \ | 
|---|
|  | 1139 | +       | v850 \ | 
|---|
|  | 1140 | +       | we32k \ | 
|---|
|  | 1141 | +       | x86 | xscale \ | 
|---|
|  | 1142 | +       | z8k) | 
|---|
|  | 1143 | basic_machine=$basic_machine-unknown | 
|---|
|  | 1144 | ;; | 
|---|
|  | 1145 | -       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl) | 
|---|
|  | 1146 | +       m6811 | m68hc11 | m6812 | m68hc12) | 
|---|
|  | 1147 | +               # Motorola 68HC11/12. | 
|---|
|  | 1148 | +               basic_machine=$basic_machine-unknown | 
|---|
|  | 1149 | +               os=-none | 
|---|
|  | 1150 | +               ;; | 
|---|
|  | 1151 | +       m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | 
|---|
|  | 1152 | ;; | 
|---|
|  | 1153 |  | 
|---|
|  | 1154 | # We use `pc' rather than `unknown' | 
|---|
|  | 1155 | # because (1) that's what they normally are, and | 
|---|
|  | 1156 | # (2) the word "unknown" tends to confuse beginning users. | 
|---|
|  | 1157 | -       i[34567]86) | 
|---|
|  | 1158 | -         if test -e /etc/SuSE-release ; then | 
|---|
|  | 1159 | -               basic_machine=$basic_machine-suse | 
|---|
|  | 1160 | -               os=-linux | 
|---|
|  | 1161 | -         else | 
|---|
|  | 1162 | -               basic_machine=$basic_machine-pc | 
|---|
|  | 1163 | -         fi | 
|---|
|  | 1164 | -         ;; | 
|---|
|  | 1165 | -       s390 | s390-suse) | 
|---|
|  | 1166 | -         basic_machine=s390-suse | 
|---|
|  | 1167 | -         ;; | 
|---|
|  | 1168 | -       s390-unknown) | 
|---|
|  | 1169 | -         basic_machine=s390-unknown | 
|---|
|  | 1170 | -         if test -e /etc/SuSE-release ; then | 
|---|
|  | 1171 | -               basic_machine=s390-suse | 
|---|
|  | 1172 | -               os=-linux | 
|---|
|  | 1173 | -         fi | 
|---|
|  | 1174 | -         ;; | 
|---|
|  | 1175 | -       s390-ibm) | 
|---|
|  | 1176 | -         basic_machine=s390-ibm | 
|---|
|  | 1177 | -         ;; | 
|---|
|  | 1178 | -       s390-redhat) | 
|---|
|  | 1179 | -         basic_machine=s390-redhat | 
|---|
|  | 1180 | +       i*86 | x86_64) | 
|---|
|  | 1181 | +         basic_machine=$basic_machine-pc | 
|---|
|  | 1182 | ;; | 
|---|
|  | 1183 | # Object if more than one company name word. | 
|---|
|  | 1184 | *-*-*) | 
|---|
|  | 1185 | @@ -216,24 +275,43 @@ | 
|---|
|  | 1186 | exit 1 | 
|---|
|  | 1187 | ;; | 
|---|
|  | 1188 | # Recognize the basic CPU types with company name. | 
|---|
|  | 1189 | -       # FIXME: clean up the formatting here. | 
|---|
|  | 1190 | -       vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | 
|---|
|  | 1191 | -             | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | 
|---|
|  | 1192 | -             | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | 
|---|
|  | 1193 | -             | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ | 
|---|
|  | 1194 | -             | xmp-* | ymp-* \ | 
|---|
|  | 1195 | -             | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \ | 
|---|
|  | 1196 | -             | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \ | 
|---|
|  | 1197 | -             | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | 
|---|
|  | 1198 | -             | clipper-* | orion-* \ | 
|---|
|  | 1199 | -             | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ | 
|---|
|  | 1200 | -             | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | 
|---|
|  | 1201 | -             | mips64el-* | mips64orion-* | mips64orionel-* \ | 
|---|
|  | 1202 | -             | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ | 
|---|
|  | 1203 | -             | mipstx39-* | mipstx39el-* | mcore-* \ | 
|---|
|  | 1204 | -             | f301-* | armv*-* | t3e-* \ | 
|---|
|  | 1205 | -             | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ | 
|---|
|  | 1206 | -             | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* ) | 
|---|
|  | 1207 | +       580-* \ | 
|---|
|  | 1208 | +       | a29k-* \ | 
|---|
|  | 1209 | +       | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | 
|---|
|  | 1210 | +       | alphapca5[67]-* | arc-* \ | 
|---|
|  | 1211 | +       | arm-*  | armbe-* | armle-* | armv*-* \ | 
|---|
|  | 1212 | +       | bs2000-* \ | 
|---|
|  | 1213 | +       | c[123]* | c30-* | [cjt]90-* | c54x-* \ | 
|---|
|  | 1214 | +       | clipper-* | cray2-* | cydra-* \ | 
|---|
|  | 1215 | +       | d10v-* | d30v-* \ | 
|---|
|  | 1216 | +       | elxsi-* \ | 
|---|
|  | 1217 | +       | f30[01]-* | f700-* | fr30-* | fx80-* \ | 
|---|
|  | 1218 | +       | h8300-* | h8500-* \ | 
|---|
|  | 1219 | +       | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | 
|---|
|  | 1220 | +       | i*86-* | i860-* | i960-* | ia64-* \ | 
|---|
|  | 1221 | +       | m32r-* \ | 
|---|
|  | 1222 | +       | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ | 
|---|
|  | 1223 | +       | m88110-* | m88k-* | mcore-* \ | 
|---|
|  | 1224 | +       | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ | 
|---|
|  | 1225 | +       | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ | 
|---|
|  | 1226 | +       | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ | 
|---|
|  | 1227 | +       | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ | 
|---|
|  | 1228 | +       | none-* | np1-* | ns16k-* | ns32k-* \ | 
|---|
|  | 1229 | +       | orion-* \ | 
|---|
|  | 1230 | +       | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | 
|---|
|  | 1231 | +       | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | 
|---|
|  | 1232 | +       | pyramid-* \ | 
|---|
|  | 1233 | +       | romp-* | rs6000-* \ | 
|---|
|  | 1234 | +       | s390-* | s390x-* \ | 
|---|
|  | 1235 | +       | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ | 
|---|
|  | 1236 | +       | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ | 
|---|
|  | 1237 | +       | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ | 
|---|
|  | 1238 | +       | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ | 
|---|
|  | 1239 | +       | v850-* | vax-* \ | 
|---|
|  | 1240 | +       | we32k-* \ | 
|---|
|  | 1241 | +       | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | 
|---|
|  | 1242 | +       | ymp-* \ | 
|---|
|  | 1243 | +       | z8k-*) | 
|---|
|  | 1244 | ;; | 
|---|
|  | 1245 | # Recognize the various machine names and aliases which stand | 
|---|
|  | 1246 | # for a CPU type and a company and sometimes even an OS. | 
|---|
|  | 1247 | @@ -270,14 +348,14 @@ | 
|---|
|  | 1248 | os=-sysv | 
|---|
|  | 1249 | ;; | 
|---|
|  | 1250 | amiga | amiga-*) | 
|---|
|  | 1251 | -               basic_machine=m68k-cbm | 
|---|
|  | 1252 | +               basic_machine=m68k-unknown | 
|---|
|  | 1253 | ;; | 
|---|
|  | 1254 | amigaos | amigados) | 
|---|
|  | 1255 | -               basic_machine=m68k-cbm | 
|---|
|  | 1256 | +               basic_machine=m68k-unknown | 
|---|
|  | 1257 | os=-amigaos | 
|---|
|  | 1258 | ;; | 
|---|
|  | 1259 | amigaunix | amix) | 
|---|
|  | 1260 | -               basic_machine=m68k-cbm | 
|---|
|  | 1261 | +               basic_machine=m68k-unknown | 
|---|
|  | 1262 | os=-sysv4 | 
|---|
|  | 1263 | ;; | 
|---|
|  | 1264 | apollo68) | 
|---|
|  | 1265 | @@ -324,13 +402,16 @@ | 
|---|
|  | 1266 | basic_machine=cray2-cray | 
|---|
|  | 1267 | os=-unicos | 
|---|
|  | 1268 | ;; | 
|---|
|  | 1269 | -       [ctj]90-cray) | 
|---|
|  | 1270 | -               basic_machine=c90-cray | 
|---|
|  | 1271 | +       [cjt]90) | 
|---|
|  | 1272 | +               basic_machine=${basic_machine}-cray | 
|---|
|  | 1273 | os=-unicos | 
|---|
|  | 1274 | ;; | 
|---|
|  | 1275 | crds | unos) | 
|---|
|  | 1276 | basic_machine=m68k-crds | 
|---|
|  | 1277 | ;; | 
|---|
|  | 1278 | +       cris | cris-* | etrax*) | 
|---|
|  | 1279 | +               basic_machine=cris-axis | 
|---|
|  | 1280 | +               ;; | 
|---|
|  | 1281 | da30 | da30-*) | 
|---|
|  | 1282 | basic_machine=m68k-da30 | 
|---|
|  | 1283 | ;; | 
|---|
|  | 1284 | @@ -378,6 +459,10 @@ | 
|---|
|  | 1285 | basic_machine=tron-gmicro | 
|---|
|  | 1286 | os=-sysv | 
|---|
|  | 1287 | ;; | 
|---|
|  | 1288 | +       go32) | 
|---|
|  | 1289 | +               basic_machine=i386-pc | 
|---|
|  | 1290 | +               os=-go32 | 
|---|
|  | 1291 | +               ;; | 
|---|
|  | 1292 | h3050r* | hiux*) | 
|---|
|  | 1293 | basic_machine=hppa1.1-hitachi | 
|---|
|  | 1294 | os=-hiuxwe2 | 
|---|
|  | 1295 | @@ -453,19 +538,19 @@ | 
|---|
|  | 1296 | basic_machine=i370-ibm | 
|---|
|  | 1297 | ;; | 
|---|
|  | 1298 | # I'm not sure what "Sysv32" means.  Should this be sysv3.2? | 
|---|
|  | 1299 | -       i[34567]86v32) | 
|---|
|  | 1300 | +       i*86v32) | 
|---|
|  | 1301 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 
|---|
|  | 1302 | os=-sysv32 | 
|---|
|  | 1303 | ;; | 
|---|
|  | 1304 | -       i[34567]86v4*) | 
|---|
|  | 1305 | +       i*86v4*) | 
|---|
|  | 1306 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 
|---|
|  | 1307 | os=-sysv4 | 
|---|
|  | 1308 | ;; | 
|---|
|  | 1309 | -       i[34567]86v) | 
|---|
|  | 1310 | +       i*86v) | 
|---|
|  | 1311 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 
|---|
|  | 1312 | os=-sysv | 
|---|
|  | 1313 | ;; | 
|---|
|  | 1314 | -       i[34567]86sol2) | 
|---|
|  | 1315 | +       i*86sol2) | 
|---|
|  | 1316 | basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` | 
|---|
|  | 1317 | os=-solaris2 | 
|---|
|  | 1318 | ;; | 
|---|
|  | 1319 | @@ -477,17 +562,6 @@ | 
|---|
|  | 1320 | basic_machine=i386-unknown | 
|---|
|  | 1321 | os=-vsta | 
|---|
|  | 1322 | ;; | 
|---|
|  | 1323 | -       i386-go32 | go32) | 
|---|
|  | 1324 | -               basic_machine=i386-unknown | 
|---|
|  | 1325 | -               os=-go32 | 
|---|
|  | 1326 | -               ;; | 
|---|
|  | 1327 | -       i386-mingw32 | mingw32) | 
|---|
|  | 1328 | -               basic_machine=i386-unknown | 
|---|
|  | 1329 | -               os=-mingw32 | 
|---|
|  | 1330 | -               ;; | 
|---|
|  | 1331 | -       i386-qnx | qnx) | 
|---|
|  | 1332 | -               basic_machine=i386-qnx | 
|---|
|  | 1333 | -               ;; | 
|---|
|  | 1334 | iris | iris4d) | 
|---|
|  | 1335 | basic_machine=mips-sgi | 
|---|
|  | 1336 | case $os in | 
|---|
|  | 1337 | @@ -513,6 +587,10 @@ | 
|---|
|  | 1338 | basic_machine=ns32k-utek | 
|---|
|  | 1339 | os=-sysv | 
|---|
|  | 1340 | ;; | 
|---|
|  | 1341 | +       mingw32) | 
|---|
|  | 1342 | +               basic_machine=i386-pc | 
|---|
|  | 1343 | +               os=-mingw32 | 
|---|
|  | 1344 | +               ;; | 
|---|
|  | 1345 | miniframe) | 
|---|
|  | 1346 | basic_machine=m68000-convergent | 
|---|
|  | 1347 | ;; | 
|---|
|  | 1348 | @@ -522,13 +600,11 @@ | 
|---|
|  | 1349 | ;; | 
|---|
|  | 1350 | mipsel*-linux*) | 
|---|
|  | 1351 | basic_machine=mipsel-unknown | 
|---|
|  | 1352 | -               test -e /etc/SuSE-release && basic_machine=mipsel-suse | 
|---|
|  | 1353 | -               os=-linux | 
|---|
|  | 1354 | +               os=-linux-gnu | 
|---|
|  | 1355 | ;; | 
|---|
|  | 1356 | mips*-linux*) | 
|---|
|  | 1357 | basic_machine=mips-unknown | 
|---|
|  | 1358 | -               test -e /etc/SuSE-release && basic_machine=mips-suse | 
|---|
|  | 1359 | -               os=-linux | 
|---|
|  | 1360 | +               os=-linux-gnu | 
|---|
|  | 1361 | ;; | 
|---|
|  | 1362 | mips3*-*) | 
|---|
|  | 1363 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` | 
|---|
|  | 1364 | @@ -536,12 +612,16 @@ | 
|---|
|  | 1365 | mips3*) | 
|---|
|  | 1366 | basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown | 
|---|
|  | 1367 | ;; | 
|---|
|  | 1368 | +       mmix*) | 
|---|
|  | 1369 | +               basic_machine=mmix-knuth | 
|---|
|  | 1370 | +               os=-mmixware | 
|---|
|  | 1371 | +               ;; | 
|---|
|  | 1372 | monitor) | 
|---|
|  | 1373 | basic_machine=m68k-rom68k | 
|---|
|  | 1374 | os=-coff | 
|---|
|  | 1375 | ;; | 
|---|
|  | 1376 | msdos) | 
|---|
|  | 1377 | -               basic_machine=i386-unknown | 
|---|
|  | 1378 | +               basic_machine=i386-pc | 
|---|
|  | 1379 | os=-msdos | 
|---|
|  | 1380 | ;; | 
|---|
|  | 1381 | mvs) | 
|---|
|  | 1382 | @@ -605,9 +685,16 @@ | 
|---|
|  | 1383 | basic_machine=i960-intel | 
|---|
|  | 1384 | os=-mon960 | 
|---|
|  | 1385 | ;; | 
|---|
|  | 1386 | +       nonstopux) | 
|---|
|  | 1387 | +               basic_machine=mips-compaq | 
|---|
|  | 1388 | +               os=-nonstopux | 
|---|
|  | 1389 | +               ;; | 
|---|
|  | 1390 | np1) | 
|---|
|  | 1391 | basic_machine=np1-gould | 
|---|
|  | 1392 | ;; | 
|---|
|  | 1393 | +       nsr-tandem) | 
|---|
|  | 1394 | +               basic_machine=nsr-tandem | 
|---|
|  | 1395 | +               ;; | 
|---|
|  | 1396 | op50n-* | op60c-*) | 
|---|
|  | 1397 | basic_machine=hppa1.1-oki | 
|---|
|  | 1398 | os=-proelf | 
|---|
|  | 1399 | @@ -637,28 +724,28 @@ | 
|---|
|  | 1400 | pc532 | pc532-*) | 
|---|
|  | 1401 | basic_machine=ns32k-pc532 | 
|---|
|  | 1402 | ;; | 
|---|
|  | 1403 | -       pentium | p5 | k5 | k6 | nexen) | 
|---|
|  | 1404 | +       pentium | p5 | k5 | k6 | nexgen) | 
|---|
|  | 1405 | basic_machine=i586-pc | 
|---|
|  | 1406 | ;; | 
|---|
|  | 1407 | -       pentiumpro | p6 | 6x86) | 
|---|
|  | 1408 | +       pentiumpro | p6 | 6x86 | athlon) | 
|---|
|  | 1409 | basic_machine=i686-pc | 
|---|
|  | 1410 | ;; | 
|---|
|  | 1411 | pentiumii | pentium2) | 
|---|
|  | 1412 | -               basic_machine=i786-pc | 
|---|
|  | 1413 | +               basic_machine=i686-pc | 
|---|
|  | 1414 | ;; | 
|---|
|  | 1415 | -       pentium-* | p5-* | k5-* | k6-* | nexen-*) | 
|---|
|  | 1416 | +       pentium-* | p5-* | k5-* | k6-* | nexgen-*) | 
|---|
|  | 1417 | basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1418 | ;; | 
|---|
|  | 1419 | -       pentiumpro-* | p6-* | 6x86-*) | 
|---|
|  | 1420 | +       pentiumpro-* | p6-* | 6x86-* | athlon-*) | 
|---|
|  | 1421 | basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1422 | ;; | 
|---|
|  | 1423 | pentiumii-* | pentium2-*) | 
|---|
|  | 1424 | -               basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1425 | +               basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1426 | ;; | 
|---|
|  | 1427 | pn) | 
|---|
|  | 1428 | basic_machine=pn-gould | 
|---|
|  | 1429 | ;; | 
|---|
|  | 1430 | -       power)  basic_machine=rs6000-ibm | 
|---|
|  | 1431 | +       power)  basic_machine=power-ibm | 
|---|
|  | 1432 | ;; | 
|---|
|  | 1433 | ppc)    basic_machine=powerpc-unknown | 
|---|
|  | 1434 | ;; | 
|---|
|  | 1435 | @@ -670,9 +757,23 @@ | 
|---|
|  | 1436 | ppcle-* | powerpclittle-*) | 
|---|
|  | 1437 | basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1438 | ;; | 
|---|
|  | 1439 | +       ppc64)  basic_machine=powerpc64-unknown | 
|---|
|  | 1440 | +               ;; | 
|---|
|  | 1441 | +       ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1442 | +               ;; | 
|---|
|  | 1443 | +       ppc64le | powerpc64little | ppc64-le | powerpc64-little) | 
|---|
|  | 1444 | +               basic_machine=powerpc64le-unknown | 
|---|
|  | 1445 | +               ;; | 
|---|
|  | 1446 | +       ppc64le-* | powerpc64little-*) | 
|---|
|  | 1447 | +               basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` | 
|---|
|  | 1448 | +               ;; | 
|---|
|  | 1449 | ps2) | 
|---|
|  | 1450 | basic_machine=i386-ibm | 
|---|
|  | 1451 | ;; | 
|---|
|  | 1452 | +       pw32) | 
|---|
|  | 1453 | +               basic_machine=i586-unknown | 
|---|
|  | 1454 | +               os=-pw32 | 
|---|
|  | 1455 | +               ;; | 
|---|
|  | 1456 | rom68k) | 
|---|
|  | 1457 | basic_machine=m68k-rom68k | 
|---|
|  | 1458 | os=-coff | 
|---|
|  | 1459 | @@ -752,6 +853,10 @@ | 
|---|
|  | 1460 | sun386 | sun386i | roadrunner) | 
|---|
|  | 1461 | basic_machine=i386-sun | 
|---|
|  | 1462 | ;; | 
|---|
|  | 1463 | +       sv1) | 
|---|
|  | 1464 | +               basic_machine=sv1-cray | 
|---|
|  | 1465 | +               os=-unicos | 
|---|
|  | 1466 | +               ;; | 
|---|
|  | 1467 | symmetry) | 
|---|
|  | 1468 | basic_machine=i386-sequent | 
|---|
|  | 1469 | os=-dynix | 
|---|
|  | 1470 | @@ -760,6 +865,10 @@ | 
|---|
|  | 1471 | basic_machine=t3e-cray | 
|---|
|  | 1472 | os=-unicos | 
|---|
|  | 1473 | ;; | 
|---|
|  | 1474 | +       tic54x | c54x*) | 
|---|
|  | 1475 | +               basic_machine=tic54x-unknown | 
|---|
|  | 1476 | +               os=-coff | 
|---|
|  | 1477 | +               ;; | 
|---|
|  | 1478 | tx39) | 
|---|
|  | 1479 | basic_machine=mipstx39-unknown | 
|---|
|  | 1480 | ;; | 
|---|
|  | 1481 | @@ -812,6 +921,10 @@ | 
|---|
|  | 1482 | basic_machine=hppa1.1-winbond | 
|---|
|  | 1483 | os=-proelf | 
|---|
|  | 1484 | ;; | 
|---|
|  | 1485 | +       windows32) | 
|---|
|  | 1486 | +               basic_machine=i386-pc | 
|---|
|  | 1487 | +               os=-windows32-msvcrt | 
|---|
|  | 1488 | +               ;; | 
|---|
|  | 1489 | xmp) | 
|---|
|  | 1490 | basic_machine=xmp-cray | 
|---|
|  | 1491 | os=-unicos | 
|---|
|  | 1492 | @@ -840,10 +953,8 @@ | 
|---|
|  | 1493 | basic_machine=hppa1.1-oki | 
|---|
|  | 1494 | ;; | 
|---|
|  | 1495 | mips) | 
|---|
|  | 1496 | -               if [ x$os = x-linux -o x$os = x-linux-gnu ]; then | 
|---|
|  | 1497 | +               if [ x$os = x-linux-gnu ]; then | 
|---|
|  | 1498 | basic_machine=mips-unknown | 
|---|
|  | 1499 | -                       test -e /etc/SuSE-release && basic_machine=mips-suse | 
|---|
|  | 1500 | -                       os=-linux | 
|---|
|  | 1501 | else | 
|---|
|  | 1502 | basic_machine=mips-mips | 
|---|
|  | 1503 | fi | 
|---|
|  | 1504 | @@ -857,13 +968,20 @@ | 
|---|
|  | 1505 | vax) | 
|---|
|  | 1506 | basic_machine=vax-dec | 
|---|
|  | 1507 | ;; | 
|---|
|  | 1508 | +       pdp10) | 
|---|
|  | 1509 | +               # there are many clones, so DEC is not a safe bet | 
|---|
|  | 1510 | +               basic_machine=pdp10-unknown | 
|---|
|  | 1511 | +               ;; | 
|---|
|  | 1512 | pdp11) | 
|---|
|  | 1513 | basic_machine=pdp11-dec | 
|---|
|  | 1514 | ;; | 
|---|
|  | 1515 | we32k) | 
|---|
|  | 1516 | basic_machine=we32k-att | 
|---|
|  | 1517 | ;; | 
|---|
|  | 1518 | -       sparc | sparcv9) | 
|---|
|  | 1519 | +       sh3 | sh4 | sh3eb | sh4eb) | 
|---|
|  | 1520 | +               basic_machine=sh-unknown | 
|---|
|  | 1521 | +               ;; | 
|---|
|  | 1522 | +       sparc | sparcv9 | sparcv9b) | 
|---|
|  | 1523 | basic_machine=sparc-sun | 
|---|
|  | 1524 | ;; | 
|---|
|  | 1525 | cydra) | 
|---|
|  | 1526 | @@ -885,6 +1003,9 @@ | 
|---|
|  | 1527 | basic_machine=c4x-none | 
|---|
|  | 1528 | os=-coff | 
|---|
|  | 1529 | ;; | 
|---|
|  | 1530 | +       *-unknown) | 
|---|
|  | 1531 | +               # Make sure to match an already-canonicalized machine name. | 
|---|
|  | 1532 | +               ;; | 
|---|
|  | 1533 | *) | 
|---|
|  | 1534 | echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 | 
|---|
|  | 1535 | exit 1 | 
|---|
|  | 1536 | @@ -924,7 +1045,7 @@ | 
|---|
|  | 1537 | os=-sysv4.2uw | 
|---|
|  | 1538 | ;; | 
|---|
|  | 1539 | -gnu/linux*) | 
|---|
|  | 1540 | -               os=`echo $os | sed -e 's|gnu/linux|linux|'` | 
|---|
|  | 1541 | +               os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` | 
|---|
|  | 1542 | ;; | 
|---|
|  | 1543 | # First accept the basic system types. | 
|---|
|  | 1544 | # The portable systems comes first. | 
|---|
|  | 1545 | @@ -941,20 +1062,36 @@ | 
|---|
|  | 1546 | | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | 
|---|
|  | 1547 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | 
|---|
|  | 1548 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | 
|---|
|  | 1549 | +             | -chorusos* | -chorusrdb* \ | 
|---|
|  | 1550 | | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | 
|---|
|  | 1551 | -             | -mingw32* | -linux-* | -uxpv* | -beos* | -mpeix* | -udk* \ | 
|---|
|  | 1552 | -             | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*) | 
|---|
|  | 1553 | +             | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | 
|---|
|  | 1554 | +             | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | 
|---|
|  | 1555 | +             | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | 
|---|
|  | 1556 | +             | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | 
|---|
|  | 1557 | +             | -os2* | -vos*) | 
|---|
|  | 1558 | # Remember, each alternative MUST END IN *, to match a version number. | 
|---|
|  | 1559 | ;; | 
|---|
|  | 1560 | +       -qnx*) | 
|---|
|  | 1561 | +               case $basic_machine in | 
|---|
|  | 1562 | +                   x86-* | i*86-*) | 
|---|
|  | 1563 | +                       ;; | 
|---|
|  | 1564 | +                   *) | 
|---|
|  | 1565 | +                       os=-nto$os | 
|---|
|  | 1566 | +                       ;; | 
|---|
|  | 1567 | +               esac | 
|---|
|  | 1568 | +               ;; | 
|---|
|  | 1569 | +       -nto*) | 
|---|
|  | 1570 | +               os=-nto-qnx | 
|---|
|  | 1571 | +               ;; | 
|---|
|  | 1572 | -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | 
|---|
|  | 1573 | | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | 
|---|
|  | 1574 | -             | -macos* | -mpw* | -magic* | -mon960* | -lnews*) | 
|---|
|  | 1575 | +             | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) | 
|---|
|  | 1576 | ;; | 
|---|
|  | 1577 | -mac*) | 
|---|
|  | 1578 | os=`echo $os | sed -e 's|mac|macos|'` | 
|---|
|  | 1579 | ;; | 
|---|
|  | 1580 | -linux*) | 
|---|
|  | 1581 | -               os=`echo $os | sed -e 's|linux-gnu|linux|'` | 
|---|
|  | 1582 | +               os=`echo $os | sed -e 's|linux|linux-gnu|'` | 
|---|
|  | 1583 | ;; | 
|---|
|  | 1584 | -sunos5*) | 
|---|
|  | 1585 | os=`echo $os | sed -e 's|sunos5|solaris2|'` | 
|---|
|  | 1586 | @@ -965,6 +1102,9 @@ | 
|---|
|  | 1587 | -opened*) | 
|---|
|  | 1588 | os=-openedition | 
|---|
|  | 1589 | ;; | 
|---|
|  | 1590 | +       -wince*) | 
|---|
|  | 1591 | +               os=-wince | 
|---|
|  | 1592 | +               ;; | 
|---|
|  | 1593 | -osfrose*) | 
|---|
|  | 1594 | os=-osfrose | 
|---|
|  | 1595 | ;; | 
|---|
|  | 1596 | @@ -989,6 +1129,9 @@ | 
|---|
|  | 1597 | -ns2 ) | 
|---|
|  | 1598 | os=-nextstep2 | 
|---|
|  | 1599 | ;; | 
|---|
|  | 1600 | +       -nsk*) | 
|---|
|  | 1601 | +               os=-nsk | 
|---|
|  | 1602 | +               ;; | 
|---|
|  | 1603 | # Preserve the version number of sinix5. | 
|---|
|  | 1604 | -sinix5.*) | 
|---|
|  | 1605 | os=`echo $os | sed -e 's|sinix|sysv|'` | 
|---|
|  | 1606 | @@ -1002,9 +1145,6 @@ | 
|---|
|  | 1607 | -oss*) | 
|---|
|  | 1608 | os=-sysv3 | 
|---|
|  | 1609 | ;; | 
|---|
|  | 1610 | -        -qnx) | 
|---|
|  | 1611 | -               os=-qnx4 | 
|---|
|  | 1612 | -               ;; | 
|---|
|  | 1613 | -svr4) | 
|---|
|  | 1614 | os=-sysv4 | 
|---|
|  | 1615 | ;; | 
|---|
|  | 1616 | @@ -1026,7 +1166,7 @@ | 
|---|
|  | 1617 | -xenix) | 
|---|
|  | 1618 | os=-xenix | 
|---|
|  | 1619 | ;; | 
|---|
|  | 1620 | -        -*mint | -*MiNT) | 
|---|
|  | 1621 | +        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 
|---|
|  | 1622 | os=-mint | 
|---|
|  | 1623 | ;; | 
|---|
|  | 1624 | -none) | 
|---|
|  | 1625 | @@ -1060,6 +1200,9 @@ | 
|---|
|  | 1626 | arm*-semi) | 
|---|
|  | 1627 | os=-aout | 
|---|
|  | 1628 | ;; | 
|---|
|  | 1629 | +       pdp10-*) | 
|---|
|  | 1630 | +               os=-tops20 | 
|---|
|  | 1631 | +               ;; | 
|---|
|  | 1632 | pdp11-*) | 
|---|
|  | 1633 | os=-none | 
|---|
|  | 1634 | ;; | 
|---|
|  | 1635 | @@ -1168,7 +1311,7 @@ | 
|---|
|  | 1636 | *-masscomp) | 
|---|
|  | 1637 | os=-rtu | 
|---|
|  | 1638 | ;; | 
|---|
|  | 1639 | -       f301-fujitsu) | 
|---|
|  | 1640 | +       f30[01]-fujitsu | f700-fujitsu) | 
|---|
|  | 1641 | os=-uxpv | 
|---|
|  | 1642 | ;; | 
|---|
|  | 1643 | *-rom68k) | 
|---|
|  | 1644 | @@ -1246,12 +1389,23 @@ | 
|---|
|  | 1645 | -mpw* | -macos*) | 
|---|
|  | 1646 | vendor=apple | 
|---|
|  | 1647 | ;; | 
|---|
|  | 1648 | -                       -*mint | -*MiNT) | 
|---|
|  | 1649 | +                       -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | 
|---|
|  | 1650 | vendor=atari | 
|---|
|  | 1651 | ;; | 
|---|
|  | 1652 | +                       -vos*) | 
|---|
|  | 1653 | +                               vendor=stratus | 
|---|
|  | 1654 | +                               ;; | 
|---|
|  | 1655 | esac | 
|---|
|  | 1656 | basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` | 
|---|
|  | 1657 | ;; | 
|---|
|  | 1658 | esac | 
|---|
|  | 1659 |  | 
|---|
|  | 1660 | echo $basic_machine$os | 
|---|
|  | 1661 | +exit 0 | 
|---|
|  | 1662 | + | 
|---|
|  | 1663 | +# Local variables: | 
|---|
|  | 1664 | +# eval: (add-hook 'write-file-hooks 'time-stamp) | 
|---|
|  | 1665 | +# time-stamp-start: "timestamp='" | 
|---|
|  | 1666 | +# time-stamp-format: "%:y-%02m-%02d" | 
|---|
|  | 1667 | +# time-stamp-end: "'" | 
|---|
|  | 1668 | +# End: | 
|---|