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