[sword-cvs] sword config.guess,1.1,1.2 config.sub,1.1,1.2
sword@www.crosswire.org
sword@www.crosswire.org
Fri, 11 Apr 2003 09:34:29 -0700
Update of /usr/local/cvsroot/sword
In directory www:/tmp/cvs-serv2408
Modified Files:
config.guess config.sub
Log Message:
dglassey: update files to cope with more archs
Index: config.guess
===================================================================
RCS file: /usr/local/cvsroot/sword/config.guess,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.guess 9 Jan 2002 12:23:38 -0000 1.1
--- config.guess 11 Apr 2003 16:34:24 -0000 1.2
***************
*** 1,8 ****
#! /bin/sh
# Attempt to guess a canonical system name.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
! timestamp='2001-09-04'
# This file is free software; you can redistribute it and/or modify it
--- 1,8 ----
#! /bin/sh
# Attempt to guess a canonical system name.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
! timestamp='2003-01-10'
# This file is free software; you can redistribute it and/or modify it
***************
*** 25,30 ****
# the same distribution terms that you use for the rest of that program.
! # Written by Per Bothner <bothner@cygnus.com>.
! # Please send patches to <config-patches@gnu.org>.
#
# This script attempts to guess a canonical system name similar to
--- 25,31 ----
# the same distribution terms that you use for the rest of that program.
! # Originally written by Per Bothner <per@bothner.com>.
! # Please send patches to <config-patches@gnu.org>. Submit a context
! # diff and a properly formatted ChangeLog entry.
#
# This script attempts to guess a canonical system name similar to
***************
*** 88,108 ****
fi
! dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
- # CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
! set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
! ,,) echo "int dummy(){}" > $dummy.c ;
! for c in cc gcc c89 ; do
! ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
! if test $? = 0 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
--- 89,120 ----
fi
+ trap 'exit 1' 1 2 15
! # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
! # compiler to aid in system detection is discouraged as it requires
! # temporary files to be created and, as you can see below, it is a
! # headache to deal with in a portable fashion.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
! # Portable tmp directory creation inspired by the Autoconf team.
!
! set_cc_for_build='
! trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
! trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
! : ${TMPDIR=/tmp} ;
! { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
! { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
! { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
! dummy=$tmp/dummy ;
! tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
! case $CC_FOR_BUILD,$HOST_CC,$CC in
! ,,) echo "int x;" > $dummy.c ;
! for c in cc gcc c89 c99 ; do
! if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
***************
*** 111,115 ****
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
! esac'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--- 123,127 ----
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
! esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
***************
*** 128,132 ****
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
! # Netbsd (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
--- 140,144 ----
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
*:NetBSD:*:*)
! # NetBSD (nbsd) targets should (where applicable) match one or
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
***************
*** 135,154 ****
# compatibility and a consistent mechanism for selecting the
# object file format.
! # Determine the machine/vendor (is the vendor relevant).
! case "${UNAME_MACHINE}" in
! amiga) machine=m68k-unknown ;;
! arm32) machine=arm-unknown ;;
! atari*) machine=m68k-atari ;;
! sun3*) machine=m68k-sun ;;
! mac68k) machine=m68k-apple ;;
! macppc) machine=powerpc-apple ;;
! hp3[0-9][05]) machine=m68k-hp ;;
! ibmrt|romp-ibm) machine=romp-ibm ;;
! *) machine=${UNAME_MACHINE}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
! case "${UNAME_MACHINE}" in
! i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--- 147,167 ----
# compatibility and a consistent mechanism for selecting the
# object file format.
! #
! # Note: NetBSD doesn't particularly care about the vendor
! # portion of the name. We always set it to "unknown".
! sysctl="sysctl -n hw.machine_arch"
! UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
! /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
! case "${UNAME_MACHINE_ARCH}" in
! armeb) machine=armeb-unknown ;;
! arm*) machine=arm-unknown ;;
! sh3el) machine=shl-unknown ;;
! sh3eb) machine=sh-unknown ;;
! *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
# to ELF recently, or will in the future.
! case "${UNAME_MACHINE_ARCH}" in
! arm*|i386|m68k|ns32k|sh3*|sparc|vax)
eval $set_cc_for_build
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
***************
*** 167,171 ****
esac
# The OS release
! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
--- 180,195 ----
esac
# The OS release
! # Debian GNU/NetBSD machines have a different userland, and
! # thus, need a distinct triplet. However, they do not need
! # kernel version information, so it can be replaced with a
! # suitable tag, in the style of linux-gnu.
! case "${UNAME_VERSION}" in
! Debian*)
! release='-gnu'
! ;;
! *)
! release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
! ;;
! esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
***************
*** 173,176 ****
--- 197,242 ----
echo "${machine}-${os}${release}"
exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ arc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ pmax:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mipseb-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ wgrisc:OpenBSD:*:*)
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MicroBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
***************
*** 181,184 ****
--- 247,251 ----
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
+ eval $set_cc_for_build
cat <<EOF >$dummy.s
.data
***************
*** 206,213 ****
.end main
EOF
! eval $set_cc_for_build
! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
! case `./$dummy` in
0-0)
UNAME_MACHINE="alpha"
--- 273,279 ----
.end main
EOF
! $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null
if test "$?" = 0 ; then
! case `$dummy` in
0-0)
UNAME_MACHINE="alpha"
***************
*** 231,237 ****
UNAME_MACHINE="alphaev68"
;;
esac
fi
- rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
--- 297,305 ----
UNAME_MACHINE="alphaev68"
;;
+ 3-1307)
+ UNAME_MACHINE="alphaev7"
+ ;;
esac
fi
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
***************
*** 248,274 ****
echo m68k-unknown-sysv4
exit 0;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
! arc64:OpenBSD:*:*)
! echo mips64el-unknown-openbsd${UNAME_RELEASE}
! exit 0 ;;
! arc:OpenBSD:*:*)
! echo mipsel-unknown-openbsd${UNAME_RELEASE}
! exit 0 ;;
! hkmips:OpenBSD:*:*)
! echo mips-unknown-openbsd${UNAME_RELEASE}
! exit 0 ;;
! pmax:OpenBSD:*:*)
! echo mipsel-unknown-openbsd${UNAME_RELEASE}
! exit 0 ;;
! sgi:OpenBSD:*:*)
! echo mips-unknown-openbsd${UNAME_RELEASE}
! exit 0 ;;
! wgrisc:OpenBSD:*:*)
! echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*:OS/390:*:*)
--- 316,324 ----
echo m68k-unknown-sysv4
exit 0;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
exit 0 ;;
! *:[Mm]orph[Oo][Ss]:*:*)
! echo ${UNAME_MACHINE}-unknown-morphos
exit 0 ;;
*:OS/390:*:*)
***************
*** 292,295 ****
--- 342,349 ----
echo pyramid-pyramid-svr4
exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
***************
*** 320,324 ****
exit 0 ;;
sun*:*:4.2BSD:*)
! UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
--- 374,378 ----
exit 0 ;;
sun*:*:4.2BSD:*)
! UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
***************
*** 334,343 ****
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
- sparc*:NetBSD:*)
- echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
- exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
--- 388,391 ----
***************
*** 366,381 ****
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
- sun3*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
--- 414,417 ----
***************
*** 416,423 ****
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy \
! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
--- 452,458 ----
}
EOF
! $CC_FOR_BUILD -o $dummy $dummy.c \
! && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
***************
*** 425,428 ****
--- 460,469 ----
echo powerpc-motorola-powermax
exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
***************
*** 497,502 ****
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
--- 538,542 ----
}
EOF
! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
***************
*** 507,511 ****
exit 0 ;;
*:AIX:*:[45])
! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
--- 547,551 ----
exit 0 ;;
*:AIX:*:[45])
! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
***************
*** 547,554 ****
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
! case "${HPUX_REV}" in
! 11.[0-9][0-9])
! if [ -x /usr/bin/getconf ]; then
! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
--- 587,592 ----
9000/[34]?? ) HP_ARCH=m68k ;;
9000/[678][0-9][0-9])
! if [ -x /usr/bin/getconf ]; then
! sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
case "${sc_cpu_version}" in
***************
*** 559,569 ****
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
esac ;;
esac
! fi ;;
! esac
! if [ "${HP_ARCH}" = "" ]; then
! eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
--- 597,607 ----
32) HP_ARCH="hppa2.0n" ;;
64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
esac ;;
esac
! fi
! if [ "${HP_ARCH}" = "" ]; then
! eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
#define _HPUX_SOURCE
***************
*** 598,606 ****
}
EOF
! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
! if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
! rm -f $dummy.c $dummy
! fi ;;
esac
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
--- 636,654 ----
}
EOF
! (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
! test -z "$HP_ARCH" && HP_ARCH=hppa
! fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
***************
*** 636,641 ****
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
--- 684,688 ----
}
EOF
! $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
***************
*** 665,671 ****
echo hppa1.1-hp-lites
exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
--- 712,715 ----
***************
*** 686,692 ****
echo c4-convex-bsd
exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--- 730,733 ----
***************
*** 701,707 ****
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--- 742,745 ----
***************
*** 710,716 ****
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
! CRAY-2:*:*:*)
! echo cray2-cray-unicos
! exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--- 748,754 ----
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
! *:UNICOS/mp:*:*)
! echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
! exit 0 ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
***************
*** 719,725 ****
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
--- 757,760 ----
***************
*** 732,739 ****
exit 0 ;;
*:FreeBSD:*:*)
! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
! exit 0 ;;
! *:OpenBSD:*:*)
! echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
i*:CYGWIN*:*)
--- 767,782 ----
exit 0 ;;
*:FreeBSD:*:*)
! # Determine whether the default compiler uses glibc.
! eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
! #include <features.h>
! #if __GLIBC__ >= 2
! LIBC=gnu
! #else
! LIBC=
! #endif
! EOF
! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
exit 0 ;;
i*:CYGWIN*:*)
***************
*** 746,754 ****
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
! echo i386-pc-interix
exit 0 ;;
i*:UWIN*:*)
--- 789,803 ----
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
+ x86:Interix*:3*)
+ echo i586-pc-interix3
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
! echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
***************
*** 771,775 ****
exit 0 ;;
ia64:Linux:*:*)
! echo ${UNAME_MACHINE}-unknown-linux
exit 0 ;;
m68*:Linux:*:*)
--- 820,824 ----
exit 0 ;;
ia64:Linux:*:*)
! echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
m68*:Linux:*:*)
***************
*** 777,784 ****
exit 0 ;;
mips:Linux:*:*)
! case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
! big) echo mips-unknown-linux-gnu && exit 0 ;;
! little) echo mipsel-unknown-linux-gnu && exit 0 ;;
! esac
;;
ppc:Linux:*:*)
--- 826,865 ----
exit 0 ;;
mips:Linux:*:*)
! eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
! #undef CPU
! #undef mips
! #undef mipsel
! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! CPU=mipsel
! #else
! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! CPU=mips
! #else
! CPU=
! #endif
! #endif
! EOF
! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
! ;;
! mips64:Linux:*:*)
! eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
! #undef CPU
! #undef mips64
! #undef mips64el
! #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
! CPU=mips64el
! #else
! #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
! CPU=mips64
! #else
! CPU=
! #endif
! #endif
! EOF
! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
! test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
***************
*** 829,833 ****
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
! ld_supported_targets=`cd /; ld --help 2>&1 \
| sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
--- 910,915 ----
# first see if it will tell us. cd to the root directory to prevent
# problems with other programs or directories called `ld' in the path.
! # Set LC_ALL=C to ensure ld outputs messages in English.
! ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
| sed -ne '/supported targets:/!d
s/[ ][ ]*/ /g
***************
*** 841,845 ****
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--- 923,927 ----
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
***************
*** 853,882 ****
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
! cat >$dummy.c <<EOF
! #include <features.h>
! #ifdef __cplusplus
! #include <stdio.h> /* for printf() prototype */
! int main (int argc, char *argv[]) {
! #else
! int main (argc, argv) int argc; char *argv[]; {
! #endif
! #ifdef __ELF__
! # ifdef __GLIBC__
! # if __GLIBC__ >= 2
! printf ("%s-pc-linux-gnu\n", argv[1]);
! # else
! printf ("%s-pc-linux-gnulibc1\n", argv[1]);
! # endif
! # else
! printf ("%s-pc-linux-gnulibc1\n", argv[1]);
! # endif
! #else
! printf ("%s-pc-linux-gnuaout\n", argv[1]);
! #endif
! return 0;
! }
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
--- 935,960 ----
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
! sed 's/^ //' << EOF >$dummy.c
! #include <features.h>
! #ifdef __ELF__
! # ifdef __GLIBC__
! # if __GLIBC__ >= 2
! LIBC=gnu
! # else
! LIBC=gnulibc1
! # endif
! # else
! LIBC=gnulibc1
! # endif
! #else
! #ifdef __INTEL_COMPILER
! LIBC=gnu
! #else
! LIBC=gnuaout
! #endif
! #endif
EOF
! eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
! test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
***************
*** 895,898 ****
--- 973,993 ----
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
***************
*** 916,926 ****
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
! UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
! (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
! (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
! (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
&& UNAME_MACHINE=i686
! (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
--- 1011,1021 ----
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
! UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
! (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
! (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
! (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
! (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
***************
*** 929,935 ****
fi
exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
--- 1024,1027 ----
***************
*** 955,961 ****
echo m68010-convergent-sysv
exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
! 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
--- 1047,1059 ----
echo m68010-convergent-sysv
exit 0 ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
M68*:*:R3V[567]*:*)
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
! 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)
OS_REL=''
test -r /etc/.relid \
***************
*** 974,980 ****
echo m68k-atari-sysv4
exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
--- 1072,1075 ----
***************
*** 1048,1051 ****
--- 1143,1149 ----
echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
***************
*** 1055,1070 ****
exit 0 ;;
*:Darwin:*:*)
! echo `uname -p`-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
! if test "${UNAME_MACHINE}" = "x86pc"; then
UNAME_MACHINE=pc
fi
! echo `uname -p`-${UNAME_MACHINE}-nto-qnx
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
! NSR-[KW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
--- 1153,1174 ----
exit 0 ;;
*:Darwin:*:*)
! case `uname -p` in
! *86) UNAME_PROCESSOR=i686 ;;
! powerpc) UNAME_PROCESSOR=powerpc ;;
! esac
! echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
! UNAME_PROCESSOR=`uname -p`
! if test "$UNAME_PROCESSOR" = "x86"; then
! UNAME_PROCESSOR=i386
UNAME_MACHINE=pc
fi
! echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
exit 0 ;;
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
! NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
***************
*** 1089,1097 ****
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
--- 1193,1196 ----
***************
*** 1112,1121 ****
echo pdp10-unknown-its
exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
esac
--- 1211,1214 ----
***************
*** 1238,1243 ****
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
# Apollos put the system type in the environment.
--- 1331,1335 ----
EOF
! $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
Index: config.sub
===================================================================
RCS file: /usr/local/cvsroot/sword/config.sub,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.sub 9 Jan 2002 12:23:38 -0000 1.1
--- config.sub 11 Apr 2003 16:34:24 -0000 1.2
***************
*** 1,8 ****
#! /bin/sh
# Configuration validation subroutine script.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
! # Free Software Foundation, Inc.
! timestamp='2001-09-07'
# This file is (in principle) common to ALL GNU software.
--- 1,8 ----
#! /bin/sh
# Configuration validation subroutine script.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! # 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
! timestamp='2003-01-03'
# This file is (in principle) common to ALL GNU software.
***************
*** 30,34 ****
# the same distribution terms that you use for the rest of that program.
! # Please send patches to <config-patches@gnu.org>.
#
# Configuration subroutine to validate and canonicalize a configuration type.
--- 30,35 ----
# the same distribution terms that you use for the rest of that program.
! # Please send patches to <config-patches@gnu.org>. Submit a context
! # diff and a properly formatted ChangeLog entry.
#
# Configuration subroutine to validate and canonicalize a configuration type.
***************
*** 118,122 ****
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
--- 119,123 ----
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
! nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
***************
*** 227,256 ****
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | c4x | clipper \
! | d10v | d30v | dsp16xx \
! | fr30 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| m32r | m68000 | m68k | m88k | mcore \
! | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
! | mips64vr4100 | mips64vr4100el | mips64vr4300 \
! | mips64vr4300el | mips64vr5000 | mips64vr5000el \
! | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
! | mipsisa32 \
| mn10200 | mn10300 \
| ns16k | ns32k \
! | openrisc \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | s390 | s390x \
! | sh | sh[34] | sh[34]eb | shbe | shle \
! | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
! | stormy16 | strongarm \
| tahoe | thumb | tic80 | tron \
! | v850 \
| we32k \
! | x86 | xscale \
| z8k)
basic_machine=$basic_machine-unknown
--- 228,269 ----
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
! | clipper \
! | d10v | d30v | dlx | dsp16xx \
! | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
+ | ip2k \
| m32r | m68000 | m68k | m88k | mcore \
! | mips | mipsbe | mipseb | mipsel | mipsle \
! | mips16 \
! | mips64 | mips64el \
! | mips64vr | mips64vrel \
! | mips64orion | mips64orionel \
! | mips64vr4100 | mips64vr4100el \
! | mips64vr4300 | mips64vr4300el \
! | mips64vr5000 | mips64vr5000el \
! | mipsisa32 | mipsisa32el \
! | mipsisa32r2 | mipsisa32r2el \
! | mipsisa64 | mipsisa64el \
! | mipsisa64sb1 | mipsisa64sb1el \
! | mipsisa64sr71k | mipsisa64sr71kel \
! | mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | msp430 \
| ns16k | ns32k \
! | openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
! | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
! | sh64 | sh64le \
! | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
! | strongarm \
| tahoe | thumb | tic80 | tron \
! | v850 | v850e \
| we32k \
! | x86 | xscale | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
***************
*** 279,301 ****
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
! | alphapca5[67]-* | arc-* \
! | arm-* | armbe-* | armle-* | armv*-* \
| bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c54x-* \
! | clipper-* | cray2-* | cydra-* \
! | d10v-* | d30v-* \
| elxsi-* \
! | f30[01]-* | f700-* | fr30-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| m32r-* \
! | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
! | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
! | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
! | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
! | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
! | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
--- 292,328 ----
| a29k-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
! | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
! | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
! | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
! | avr-* \
| bs2000-* \
! | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \
! | clipper-* | cydra-* \
! | d10v-* | d30v-* | dlx-* \
| elxsi-* \
! | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* \
| m32r-* \
! | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
! | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
! | mips16-* \
! | mips64-* | mips64el-* \
! | mips64vr-* | mips64vrel-* \
! | mips64orion-* | mips64orionel-* \
! | mips64vr4100-* | mips64vr4100el-* \
! | mips64vr4300-* | mips64vr4300el-* \
! | mips64vr5000-* | mips64vr5000el-* \
! | mipsisa32-* | mipsisa32el-* \
! | mipsisa32r2-* | mipsisa32r2el-* \
! | mipsisa64-* | mipsisa64el-* \
! | mipsisa64sb1-* | mipsisa64sb1el-* \
! | mipsisa64sr71k-* | mipsisa64sr71kel-* \
! | mipstx39-* | mipstx39el-* \
! | msp430-* \
! | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
***************
*** 303,314 ****
| pyramid-* \
| romp-* | rs6000-* \
! | s390-* | s390x-* \
! | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
! | sparc-* | sparc64-* | sparc86x-* | sparclite-* \
! | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
! | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
! | v850-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
| ymp-* \
| z8k-*)
--- 330,342 ----
| pyramid-* \
| romp-* | rs6000-* \
! | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
! | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
! | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
! | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
! | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \
! | v850-* | v850e-* | vax-* \
| we32k-* \
! | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
! | xtensa-* \
| ymp-* \
| z8k-*)
***************
*** 375,378 ****
--- 403,410 ----
os=-dynix
;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
convex-c1)
basic_machine=c1-convex
***************
*** 395,408 ****
os=-bsd
;;
! cray | ymp)
! basic_machine=ymp-cray
! os=-unicos
! ;;
! cray2)
! basic_machine=cray2-cray
! os=-unicos
! ;;
! [cjt]90)
! basic_machine=${basic_machine}-cray
os=-unicos
;;
--- 427,432 ----
os=-bsd
;;
! cray | j90)
! basic_machine=j90-cray
os=-unicos
;;
***************
*** 419,422 ****
--- 443,454 ----
basic_machine=mips-dec
;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
***************
*** 599,610 ****
os=-mint
;;
- mipsel*-linux*)
- basic_machine=mipsel-unknown
- os=-linux-gnu
- ;;
- mips*-linux*)
- basic_machine=mips-unknown
- os=-linux-gnu
- ;;
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
--- 631,634 ----
***************
*** 621,624 ****
--- 645,652 ----
os=-coff
;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
msdos)
basic_machine=i386-pc
***************
*** 693,696 ****
--- 721,728 ----
basic_machine=np1-gould
;;
+ nv1)
+ basic_machine=nv1-cray
+ os=-unicosmp
+ ;;
nsr-tandem)
basic_machine=nsr-tandem
***************
*** 700,703 ****
--- 732,739 ----
os=-proelf
;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
***************
*** 722,732 ****
basic_machine=m68k-tti
;;
! pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
! pentium | p5 | k5 | k6 | nexgen)
basic_machine=i586-pc
;;
! pentiumpro | p6 | 6x86 | athlon)
basic_machine=i686-pc
;;
--- 758,768 ----
basic_machine=m68k-tti
;;
! pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
! pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
! pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
***************
*** 734,738 ****
basic_machine=i686-pc
;;
! pentium-* | p5-* | k5-* | k6-* | nexgen-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
--- 770,774 ----
basic_machine=i686-pc
;;
! pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
***************
*** 749,768 ****
;;
ppc) basic_machine=powerpc-unknown
! ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
! ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
! ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
! ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
--- 785,804 ----
;;
ppc) basic_machine=powerpc-unknown
! ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
! ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
! ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
! ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
***************
*** 785,792 ****
--- 821,840 ----
basic_machine=romp-ibm
;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
sa29200)
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
sequent)
basic_machine=i386-sequent
***************
*** 796,800 ****
os=-hms
;;
! sparclite-wrs)
basic_machine=sparclite-wrs
os=-vxworks
--- 844,848 ----
os=-hms
;;
! sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
***************
*** 863,869 ****
;;
t3e)
! basic_machine=t3e-cray
os=-unicos
;;
tic54x | c54x*)
basic_machine=tic54x-unknown
--- 911,925 ----
;;
t3e)
! basic_machine=alphaev5-cray
os=-unicos
;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ tic4x | c4x*)
+ basic_machine=tic4x-unknown
+ os=-coff
+ ;;
tic54x | c54x*)
basic_machine=tic54x-unknown
***************
*** 876,879 ****
--- 932,939 ----
basic_machine=mipstx39el-unknown
;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
tower | tower-32)
basic_machine=m68k-ncr
***************
*** 900,905 ****
;;
vpp*|vx|vx-*)
! basic_machine=f301-fujitsu
! ;;
vxworks960)
basic_machine=i960-wrs
--- 960,965 ----
;;
vpp*|vx|vx-*)
! basic_machine=f301-fujitsu
! ;;
vxworks960)
basic_machine=i960-wrs
***************
*** 922,936 ****
os=-proelf
;;
! windows32)
! basic_machine=i386-pc
! os=-windows32-msvcrt
;;
! xmp)
! basic_machine=xmp-cray
os=-unicos
;;
- xps | xps100)
- basic_machine=xps100-honeywell
- ;;
z8k-*-coff)
basic_machine=z8k-unknown
--- 982,992 ----
os=-proelf
;;
! xps | xps100)
! basic_machine=xps100-honeywell
;;
! ymp)
! basic_machine=ymp-cray
os=-unicos
;;
z8k-*-coff)
basic_machine=z8k-unknown
***************
*** 953,963 ****
basic_machine=hppa1.1-oki
;;
- mips)
- if [ x$os = x-linux-gnu ]; then
- basic_machine=mips-unknown
- else
- basic_machine=mips-mips
- fi
- ;;
romp)
basic_machine=romp-ibm
--- 1009,1012 ----
***************
*** 979,989 ****
basic_machine=we32k-att
;;
! sh3 | sh4 | sh3eb | sh4eb)
basic_machine=sh-unknown
;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
! cydra)
basic_machine=cydra-cydrome
;;
--- 1028,1041 ----
basic_machine=we32k-att
;;
! sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
basic_machine=sh-unknown
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparc | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
! cydra)
basic_machine=cydra-cydrome
;;
***************
*** 1000,1007 ****
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
--- 1052,1055 ----
***************
*** 1066,1073 ****
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
! | -os2* | -vos*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
--- 1114,1123 ----
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
! | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
! | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
! | -powermax* | -dnix* | -microbsd*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
***************
*** 1081,1086 ****
esac
;;
-nto*)
! os=-nto-qnx
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
--- 1131,1138 ----
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
! os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
***************
*** 1121,1124 ****
--- 1173,1179 ----
os=-aos
;;
+ -atheos*)
+ os=-atheos
+ ;;
-386bsd)
os=-bsd
***************
*** 1127,1132 ****
os=-sysv
;;
-ns2 )
! os=-nextstep2
;;
-nsk*)
--- 1182,1190 ----
os=-sysv
;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
-ns2 )
! os=-nextstep2
;;
-nsk*)
***************
*** 1167,1172 ****
os=-xenix
;;
! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! os=-mint
;;
-none)
--- 1225,1230 ----
os=-xenix
;;
! -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
! os=-mint
;;
-none)
***************
*** 1201,1208 ****
os=-aout
;;
pdp10-*)
os=-tops20
;;
! pdp11-*)
os=-none
;;
--- 1259,1267 ----
os=-aout
;;
+ # This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
! pdp11-*)
os=-none
;;
***************
*** 1231,1234 ****
--- 1290,1296 ----
os=-elf
;;
+ or32-*)
+ os=-coff
+ ;;
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
***************
*** 1294,1301 ****
os=-nextstep3
;;
! *-gould)
os=-sysv
;;
! *-highlevel)
os=-bsd
;;
--- 1356,1363 ----
os=-nextstep3
;;
! *-gould)
os=-sysv
;;
! *-highlevel)
os=-bsd
;;
***************
*** 1303,1310 ****
os=-bsd
;;
! *-sgi)
os=-irix
;;
! *-siemens)
os=-sysv4
;;
--- 1365,1372 ----
os=-bsd
;;
! *-sgi)
os=-irix
;;
! *-siemens)
os=-sysv4
;;
***************
*** 1378,1382 ****
vendor=sequent
;;
! -vxsim* | -vxworks*)
vendor=wrs
;;
--- 1440,1444 ----
vendor=sequent
;;
! -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;