This is the mail archive of the
gdb-patches@sourceware.cygnus.com
mailing list for the GDB project.
config.guess, config.sub update
- To: BINUTILS Patches <binutils at sourceware dot cygnus dot com>, GDB Patches <gdb-patches at sourceware dot cygnus dot com>
- Subject: config.guess, config.sub update
- From: Andrew Cagney <ac131313 at cygnus dot com>
- Date: Thu, 24 Feb 2000 16:23:28 +1100
- Organization: Cygnus Solutions
Hello,
The attatched brings in the latest (well 2000-02-15) config.guess and
config.sub from the config CVS repository.
I've been through the CVS entries since the last update and, as far as I
can tell, all changes are in.
ok?
Andrew
Thu Feb 24 16:15:56 2000 Andrew Cagney <cagney@b1.cygnus.com>
* config.guess, config.sub: Updated to match config's 2000-02-15
version.
Index: config.guess
===================================================================
RCS file: /cvs/src/src/config.guess,v
retrieving revision 1.3
diff -p -r1.3 config.guess
*** config.guess 2000/02/21 03:24:17 1.3
--- config.guess 2000/02/24 05:19:01
***************
*** 1,6 ****
#! /bin/sh
# Attempt to guess a canonical system name.
! # Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 1999 Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
--- 1,7 ----
#! /bin/sh
# Attempt to guess a canonical system name.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
! # Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
***************
*** 22,28 ****
# the same distribution terms that you use for the rest of that program.
# Written by Per Bothner <bothner@cygnus.com>.
! # The master version of this file is at the FSF in /home/gd/gnu/lib.
#
# This script attempts to guess a canonical system name similar to
# config.sub. If it succeeds, it prints the system name on stdout, and
--- 23,29 ----
# 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
# config.sub. If it succeeds, it prints the system name on stdout, and
***************
*** 35,40 ****
--- 36,55 ----
# (but try to keep the structure clean).
#
+ # Use $HOST_CC if defined. $CC may point to a cross-compiler
+ if test x"$CC_FOR_BUILD" = x; then
+ if test x"$HOST_CC" != x; then
+ CC_FOR_BUILD="$HOST_CC"
+ else
+ if test x"$CC" != x; then
+ CC_FOR_BUILD="$CC"
+ else
+ CC_FOR_BUILD=cc
+ fi
+ fi
+ fi
+
+
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 8/24/94.)
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
*************** UNAME_RELEASE=`(uname -r) 2>/dev/null` |
*** 46,56 ****
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
! trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--- 61,109 ----
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
! dummy=dummy-$$
! trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
# Note: order is significant - the case branches are not exclusive.
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
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # 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-cbm ;;
+ 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 echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ # The OS release
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
alpha:OSF1:*:*)
if test $UNAME_RELEASE = "V4.0"; then
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
*************** case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
*** 59,114 ****
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
! cat <<EOF >dummy.s
.globl main
.ent main
main:
! .frame \$30,0,\$26,0
! .prologue 0
! .long 0x47e03d80 # implver $0
! lda \$2,259
! .long 0x47e20c21 # amask $2,$1
! srl \$1,8,\$2
! sll \$2,2,\$2
! sll \$0,3,\$0
! addl \$1,\$0,\$0
! addl \$2,\$0,\$0
! ret \$31,(\$26),1
.end main
EOF
! ${CC-cc} dummy.s -o dummy 2>/dev/null
if test "$?" = 0 ; then
! ./dummy
! case "$?" in
! 7)
UNAME_MACHINE="alpha"
;;
! 15)
UNAME_MACHINE="alphaev5"
;;
! 14)
UNAME_MACHINE="alphaev56"
;;
! 10)
UNAME_MACHINE="alphapca56"
;;
! 16)
UNAME_MACHINE="alphaev6"
;;
esac
fi
! rm -f dummy.s dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-cbm-sysv4
exit 0;;
- amiga:NetBSD:*:*)
- echo m68k-cbm-netbsd${UNAME_RELEASE}
- exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
--- 112,180 ----
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
! cat <<EOF >$dummy.s
! .data
! \$Lformat:
! .byte 37,100,45,37,120,10,0 # "%d-%x\n"
!
! .text
.globl main
+ .align 4
.ent main
main:
! .frame \$30,16,\$26,0
! ldgp \$29,0(\$27)
! .prologue 1
! .long 0x47e03d80 # implver \$0
! lda \$2,-1
! .long 0x47e20c21 # amask \$2,\$1
! lda \$16,\$Lformat
! mov \$0,\$17
! not \$1,\$18
! jsr \$26,printf
! ldgp \$29,0(\$26)
! mov 0,\$16
! jsr \$26,exit
.end main
EOF
! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
! case `./$dummy` in
! 0-0)
UNAME_MACHINE="alpha"
;;
! 1-0)
UNAME_MACHINE="alphaev5"
;;
! 1-1)
UNAME_MACHINE="alphaev56"
;;
! 1-101)
UNAME_MACHINE="alphapca56"
;;
! 2-303)
UNAME_MACHINE="alphaev6"
;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
+ ;;
esac
fi
! rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-cbm-sysv4
exit 0;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
*************** EOF
*** 133,148 ****
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
- arm32:NetBSD:*:*)
- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
! Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
--- 199,214 ----
wgrisc:OpenBSD:*:*)
echo mipsel-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
SR2?01:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
exit 0;;
! Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
echo pyramid-pyramid-sysv3
*************** EOF
*** 150,156 ****
echo pyramid-pyramid-bsd
fi
exit 0 ;;
! NILE:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
sun4H:SunOS:5.*:*)
--- 216,222 ----
echo pyramid-pyramid-bsd
fi
exit 0 ;;
! NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
sun4H:SunOS:5.*:*)
*************** EOF
*** 195,215 ****
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
exit 0 ;;
- atari*:NetBSD:*:*)
- echo m68k-atari-netbsd${UNAME_RELEASE}
- exit 0 ;;
atari*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
! sun3*:NetBSD:*:*)
! echo m68k-sun-netbsd${UNAME_RELEASE}
exit 0 ;;
sun3*:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- mac68k:NetBSD:*:*)
- echo m68k-apple-netbsd${UNAME_RELEASE}
- exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
--- 261,298 ----
aushp:SunOS:*:*)
echo sparc-auspex-sunos${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
! # "atarist" or "atariste" at least should have a processor
! # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
! # to the lowercase version "mint" (or "freemint"). Finally
! # the system name "TOS" denotes a system which is actually not
! # MiNT. But MiNT is downward compatible to TOS, so this should
! # be no problem.
! atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
! echo m68k-atari-mint${UNAME_RELEASE}
exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ 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 ;;
*************** EOF
*** 231,242 ****
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
exit 0 ;;
! 2020:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
! sed 's/^ //' << EOF >dummy.c
! int main (argc, argv) int argc; char **argv; {
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
--- 314,330 ----
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
exit 0 ;;
! 2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
! sed 's/^ //' << EOF >$dummy.c
! #ifdef __cplusplus
! #include <stdio.h> /* for printf() prototype */
! int main (int argc, char *argv[]) {
! #else
! int main (argc, argv) int argc; char *argv[]; {
! #endif
#if defined (host_mips) && defined (MIPSEB)
#if defined (SYSTYPE_SYSV)
printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
*************** EOF
*** 251,260 ****
exit (-1);
}
EOF
! ${CC-cc} dummy.c -o dummy \
! && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! && rm dummy.c dummy && exit 0
! rm -f dummy.c dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
--- 339,348 ----
exit (-1);
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy \
! && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
! && rm $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
*************** EOF
*** 272,286 ****
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
! if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
! -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
echo m88k-dg-dgux${UNAME_RELEASE}
! else
echo m88k-dg-dguxbcs${UNAME_RELEASE}
fi
- else echo i586-dg-dgux${UNAME_RELEASE}
- fi
exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
--- 360,377 ----
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
! if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
! then
! if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
! [ ${TARGET_BINARY_INTERFACE}x = x ]
! then
echo m88k-dg-dgux${UNAME_RELEASE}
! else
echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
fi
exit 0 ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
*************** EOF
*** 306,312 ****
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
! sed 's/^ //' << EOF >dummy.c
#include <sys/systemcfg.h>
main()
--- 397,403 ----
exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
! sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
main()
*************** EOF
*** 317,324 ****
exit(0);
}
EOF
! ${CC-cc} dummy.c -o dummy && ./dummy && rm 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
echo rs6000-ibm-aix3.2.4
--- 408,415 ----
exit(0);
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $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
echo rs6000-ibm-aix3.2.4
*************** EOF
*** 327,333 ****
fi
exit 0 ;;
*:AIX:*:4)
! if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
--- 418,425 ----
fi
exit 0 ;;
*:AIX:*:4)
! IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
! if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
*************** EOF
*** 345,351 ****
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
exit 0 ;;
! ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
--- 437,443 ----
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
exit 0 ;;
! ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
*************** EOF
*** 360,392 ****
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
exit 0 ;;
- *9??*:MPE/iX:*:*)
- echo hppa1.0-hp-mpeix
- exit 0 ;;
9000/[34678]??:HP-UX:*:*)
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
! 9000/[678][0-9][0-9] )
!
! sed 's/^ //' << EOF >dummy.c
#include <stdlib.h>
#include <unistd.h>
!
int main ()
{
#if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS);
! #endif
long cpu = sysconf (_SC_CPU_VERSION);
!
! switch (cpu)
{
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
! case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS)
! switch (bits)
{
case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break;
--- 452,480 ----
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
exit 0 ;;
9000/[34678]??:HP-UX:*:*)
case "${UNAME_MACHINE}" in
9000/31? ) HP_ARCH=m68000 ;;
9000/[34]?? ) HP_ARCH=m68k ;;
! 9000/[678][0-9][0-9])
! sed 's/^ //' << EOF >$dummy.c
#include <stdlib.h>
#include <unistd.h>
!
int main ()
{
#if defined(_SC_KERNEL_BITS)
long bits = sysconf(_SC_KERNEL_BITS);
! #endif
long cpu = sysconf (_SC_CPU_VERSION);
!
! switch (cpu)
{
case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
! case CPU_PA_RISC2_0:
#if defined(_SC_KERNEL_BITS)
! switch (bits)
{
case 64: puts ("hppa2.0w"); break;
case 32: puts ("hppa2.0n"); break;
*************** EOF
*** 394,413 ****
} break;
#else /* !defined(_SC_KERNEL_BITS) */
puts ("hppa2.0"); break;
! #endif
default: puts ("hppa1.0"); break;
}
exit (0);
}
EOF
! (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
! rm -f dummy.c dummy
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
! sed 's/^ //' << EOF >dummy.c
#include <unistd.h>
int
main ()
--- 482,501 ----
} break;
#else /* !defined(_SC_KERNEL_BITS) */
puts ("hppa2.0"); break;
! #endif
default: puts ("hppa1.0"); break;
}
exit (0);
}
EOF
! (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
! rm -f $dummy.c $dummy
esac
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
3050*:HI-UX:*:*)
! sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
main ()
*************** EOF
*** 432,439 ****
exit (0);
}
EOF
! ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
! rm -f dummy.c dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
--- 520,527 ----
exit (0);
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
*************** EOF
*** 442,447 ****
--- 530,538 ----
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
exit 0 ;;
+ *9??*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
exit 0 ;;
*************** EOF
*** 491,497 ****
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
exit 0 ;;
CRAY*TS:*:*:*)
! echo t90-cray-unicos${UNAME_RELEASE}
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
--- 582,594 ----
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
exit 0 ;;
CRAY*TS:*:*:*)
! echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
! exit 0 ;;
! CRAY*T3E:*:*:*)
! echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
! exit 0 ;;
! CRAY*SV1:*:*:*)
! echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY-2:*:*:*)
echo cray2-cray-unicos
*************** EOF
*** 504,518 ****
F301:UNIX_System_V:*:*)
echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
exit 0 ;;
- hp3[0-9][05]:NetBSD:*:*)
- echo m68k-hp-netbsd${UNAME_RELEASE}
- exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
! i?86:BSD/386:*:* | *:BSD/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
*:FreeBSD:*:*)
if test -x /usr/bin/objformat; then
if test "elf" = "`/usr/bin/objformat`"; then
--- 601,618 ----
F301:UNIX_System_V:*:*)
echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
! i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
*:FreeBSD:*:*)
if test -x /usr/bin/objformat; then
if test "elf" = "`/usr/bin/objformat`"; then
*************** EOF
*** 520,551 ****
exit 0
fi
fi
! echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
exit 0 ;;
- *:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
exit 0 ;;
! i*:[Cc][Yy][Gg][Ww][Ii][Nn]*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
! # How do we know it's Interix rather than generic posix subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
! # change UNAME_MACHINE based on the output of uname instead of
! # i386?
echo i386-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
p*:CYGWIN*:*)
! echo powerpcle-unknown-cygwin32
exit 0 ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
--- 620,647 ----
exit 0
fi
fi
! 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*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit 0 ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
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*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
p*:CYGWIN*:*)
! echo powerpcle-unknown-cygwin
exit 0 ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
*************** EOF
*** 554,569 ****
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
- # uname on the ARM produces all sorts of strangeness, and we need to
- # filter it out.
- case "$UNAME_MACHINE" in
- armv*) UNAME_MACHINE=$UNAME_MACHINE ;;
- arm* | sa110*) UNAME_MACHINE="arm" ;;
- esac
# The BFD linker knows what the default object file format is, so
! # first see if it will tell us.
! ld_help_string=`ld --help 2>&1`
ld_supported_emulations=`echo $ld_help_string \
| sed -ne '/supported emulations:/!d
s/[ ][ ]*/ /g
--- 650,660 ----
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
*:Linux:*:*)
# The BFD linker knows what the default object file format is, so
! # 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_help_string=`cd /; ld --help 2>&1`
ld_supported_emulations=`echo $ld_help_string \
| sed -ne '/supported emulations:/!d
s/[ ][ ]*/ /g
*************** EOF
*** 571,584 ****
s/ .*//
p'`
case "$ld_supported_emulations" in
! i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;;
! i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;;
! sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
! m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
elf32ppc | elf32ppclinux)
# Determine Lib Version
! cat >dummy.c <<EOF
#include <features.h>
#if defined(__GLIBC__)
extern char __libc_version[];
--- 662,702 ----
s/ .*//
p'`
case "$ld_supported_emulations" in
! *ia64)
! echo "${UNAME_MACHINE}-unknown-linux"
! exit 0
! ;;
! i?86linux)
! echo "${UNAME_MACHINE}-pc-linux-gnuaout"
! exit 0
! ;;
! i?86coff)
! echo "${UNAME_MACHINE}-pc-linux-gnucoff"
! exit 0
! ;;
! sparclinux)
! echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
! exit 0
! ;;
! armlinux)
! echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
! exit 0
! ;;
! elf32arm*)
! echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
! exit 0
! ;;
! armelf_linux*)
! echo "${UNAME_MACHINE}-unknown-linux-gnu"
! exit 0
! ;;
! m68klinux)
! echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
! exit 0
! ;;
elf32ppc | elf32ppclinux)
# Determine Lib Version
! cat >$dummy.c <<EOF
#include <features.h>
#if defined(__GLIBC__)
extern char __libc_version[];
*************** main(argc, argv)
*** 597,667 ****
}
EOF
LIBC=""
! ${CC-cc} dummy.c -o dummy 2>/dev/null
if test "$?" = 0 ; then
! ./dummy | grep 1\.99 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
fi
! rm -f dummy.c dummy
! echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
! sed 's/^ //' <<EOF >dummy.s
! .globl main
! .ent main
! main:
! .frame \$30,0,\$26,0
! .prologue 0
! .long 0x47e03d80 # implver $0
! lda \$2,259
! .long 0x47e20c21 # amask $2,$1
! srl \$1,8,\$2
! sll \$2,2,\$2
! sll \$0,3,\$0
! addl \$1,\$0,\$0
! addl \$2,\$0,\$0
! ret \$31,(\$26),1
! .end main
EOF
LIBC=""
! ${CC-cc} dummy.s -o dummy 2>/dev/null
if test "$?" = 0 ; then
! ./dummy
! case "$?" in
! 7)
UNAME_MACHINE="alpha"
;;
! 15)
UNAME_MACHINE="alphaev5"
;;
! 14)
UNAME_MACHINE="alphaev56"
;;
! 10)
UNAME_MACHINE="alphapca56"
;;
! 16)
UNAME_MACHINE="alphaev6"
;;
! esac
! objdump --private-headers dummy | \
grep ld.so.1 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
! fi
! rm -f dummy.s dummy
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
elif test "${UNAME_MACHINE}" = "mips" ; then
! cat >dummy.c <<EOF
! main(argc, argv)
! int argc;
! char *argv[];
! {
#ifdef __MIPSEB__
printf ("%s-unknown-linux-gnu\n", argv[1]);
#endif
--- 715,799 ----
}
EOF
LIBC=""
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
if test "$?" = 0 ; then
! ./$dummy | grep 1\.99 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
fi
! rm -f $dummy.c $dummy
! echo powerpc-unknown-linux-gnu${LIBC}
! exit 0
! ;;
esac
if test "${UNAME_MACHINE}" = "alpha" ; then
! cat <<EOF >$dummy.s
! .data
! \$Lformat:
! .byte 37,100,45,37,120,10,0 # "%d-%x\n"
!
! .text
! .globl main
! .align 4
! .ent main
! main:
! .frame \$30,16,\$26,0
! ldgp \$29,0(\$27)
! .prologue 1
! .long 0x47e03d80 # implver \$0
! lda \$2,-1
! .long 0x47e20c21 # amask \$2,\$1
! lda \$16,\$Lformat
! mov \$0,\$17
! not \$1,\$18
! jsr \$26,printf
! ldgp \$29,0(\$26)
! mov 0,\$16
! jsr \$26,exit
! .end main
EOF
LIBC=""
! $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
if test "$?" = 0 ; then
! case `./$dummy` in
! 0-0)
UNAME_MACHINE="alpha"
;;
! 1-0)
UNAME_MACHINE="alphaev5"
;;
! 1-1)
UNAME_MACHINE="alphaev56"
;;
! 1-101)
UNAME_MACHINE="alphapca56"
;;
! 2-303)
UNAME_MACHINE="alphaev6"
+ ;;
+ 2-307)
+ UNAME_MACHINE="alphaev67"
;;
! esac
! objdump --private-headers $dummy | \
grep ld.so.1 > /dev/null
if test "$?" = 0 ; then
LIBC="libc1"
fi
! fi
! rm -f $dummy.s $dummy
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
elif test "${UNAME_MACHINE}" = "mips" ; then
! cat >$dummy.c <<EOF
! #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 __MIPSEB__
printf ("%s-unknown-linux-gnu\n", argv[1]);
#endif
*************** main(argc, argv)
*** 671,678 ****
return 0;
}
EOF
! ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
! rm -f dummy.c dummy
else
# Either a pre-BFD a.out linker (linux-gnuoldld)
# or one that does not give us useful --help.
--- 803,812 ----
return 0;
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
! elif test "${UNAME_MACHINE}" = "s390"; then
! echo s390-ibm-linux && exit 0
else
# Either a pre-BFD a.out linker (linux-gnuoldld)
# or one that does not give us useful --help.
*************** EOF
*** 691,702 ****
;;
esac
# Determine whether the default compiler is a.out or elf
! cat >dummy.c <<EOF
#include <features.h>
! main(argc, argv)
! int argc;
! char *argv[];
! {
#ifdef __ELF__
# ifdef __GLIBC__
# if __GLIBC__ >= 2
--- 825,838 ----
;;
esac
# Determine whether the default compiler is a.out or elf
! 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
*************** main(argc, argv)
*** 713,720 ****
return 0;
}
EOF
! ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
! rm -f dummy.c dummy
fi ;;
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
# are messed up and put the nodename in both sysname and nodename.
--- 849,856 ----
return 0;
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
fi ;;
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
# are messed up and put the nodename in both sysname and nodename.
*************** EOF
*** 730,753 ****
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
! echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
else
! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
fi
exit 0 ;;
! i?86:*:5:7)
! 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
! # 5.0.4c returns "Pent II". 5.0.5 returns PentII
! (/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}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
! exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
--- 866,887 ----
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
! echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
else
! echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
exit 0 ;;
! i?86:*:5:7*)
! # Fixed at (any) Pentium or better
! UNAME_MACHINE=i586
! if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
! echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
! else
! echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
! fi
! exit 0 ;;
i?86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
*************** EOF
*** 757,774 ****
(/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.*PentII' >/dev/null) \
&& UNAME_MACHINE=i686
! (/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
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
pc:*:*:*)
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
--- 891,910 ----
(/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
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
+ i?86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
pc:*:*:*)
+ # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
*************** EOF
*** 809,815 ****
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
! i?86:LynxOS:2.*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
--- 945,951 ----
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
! i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
*************** EOF
*** 821,826 ****
--- 957,965 ----
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
exit 0 ;;
*************** EOF
*** 851,857 ****
news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
! R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
--- 990,996 ----
news*:NEWS-OS:*:6*)
echo mips-sony-newsos6
exit 0 ;;
! R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
*************** EOF
*** 867,878 ****
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
! cat >dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
--- 1006,1038 ----
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Mac*OS:*:*)
+ echo powerpc-apple-macos${UNAME_RELEASE}
+ exit 0 ;;
+ *:Mac*OS:*:*)
+ echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-qnx-qnx${UNAME_VERSION}
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
! cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
# include <sys/utsname.h>
*************** main ()
*** 910,916 ****
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
! printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
--- 1070,1079 ----
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
! if (version < 4)
! printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
! else
! printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
*************** main ()
*** 970,977 ****
}
EOF
! ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
! rm -f dummy.c dummy
# Apollos put the system type in the environment.
--- 1133,1140 ----
}
EOF
! $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
! rm -f $dummy.c $dummy
# Apollos put the system type in the environment.
Index: config.sub
===================================================================
RCS file: /cvs/src/src/config.sub,v
retrieving revision 1.5
diff -p -r1.5 config.sub
*** config.sub 1999/09/04 16:52:13 1.5
--- config.sub 2000/02/24 05:19:03
***************
*** 1,6 ****
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
! # Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
--- 1,8 ----
#! /bin/sh
# Configuration validation subroutine script, version 1.1.
! # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
! # Free Software Foundation, Inc.
! #
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
***************
*** 25,30 ****
--- 27,35 ----
# configuration script generated by Autoconf, you may include it under
# 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>.
+ #
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
*************** case $os in
*** 105,111 ****
-scout)
;;
-wrs)
! os=vxworks
basic_machine=$1
;;
-hiux*)
--- 110,116 ----
-scout)
;;
-wrs)
! os=-vxworks
basic_machine=$1
;;
-hiux*)
*************** case $os in
*** 156,182 ****
-psos*)
os=-psos
;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
! tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
| mips64vr5000 | miprs64vr5000el | mcore \
! | m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
! | sparc | sparclet | sparclite | sparc64 | sparc86x | sparcv9 \
! | thumb | v850 | c4x | d10v | h8500 | w65 | fr30 | pj | pjl)
basic_machine=$basic_machine-unknown
;;
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
--- 161,194 ----
-psos*)
os=-psos
;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
esac
# Decode aliases for certain CPU-COMPANY combinations.
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
! tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
| 580 | i960 | h8300 \
| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+ | alphaev6[78] \
| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
| mips64orion | mips64orionel | mipstx39 | mipstx39el \
| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
| mips64vr5000 | miprs64vr5000el | mcore \
! | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
! | thumb | d10v | fr30 | avr)
basic_machine=$basic_machine-unknown
;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+ ;;
+
# We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
*************** case $basic_machine in
*** 189,201 ****
exit 1
;;
# Recognize the basic CPU types with company name.
! vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
--- 201,215 ----
exit 1
;;
# Recognize the basic CPU types with company name.
! # FIXME: clean up the formatting here.
! vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
| m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
| xmp-* | ymp-* \
| hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+ | alphaev6[78]-* \
| we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
| clipper-* | orion-* \
| sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
*************** case $basic_machine in
*** 203,209 ****
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* | mcore-* \
! | f301-* | arm*-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
| thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
;;
--- 217,223 ----
| mips64el-* | mips64orion-* | mips64orionel-* \
| mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
| mipstx39-* | mipstx39el-* | mcore-* \
! | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
| m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
| thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
;;
*************** case $basic_machine in
*** 423,429 ****
;;
i370-ibm* | ibm*)
basic_machine=i370-ibm
- os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
i[34567]86v32)
--- 437,442 ----
*************** case $basic_machine in
*** 458,463 ****
--- 471,479 ----
basic_machine=i386-unknown
os=-mingw32
;;
+ i386-qnx | qnx)
+ basic_machine=i386-qnx
+ ;;
iris | iris4d)
basic_machine=mips-sgi
case $os in
*************** case $basic_machine in
*** 486,492 ****
miniframe)
basic_machine=m68000-convergent
;;
! *mint | *MiNT)
basic_machine=m68k-atari
os=-mint
;;
--- 502,508 ----
miniframe)
basic_machine=m68000-convergent
;;
! *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
basic_machine=m68k-atari
os=-mint
;;
*************** case $basic_machine in
*** 504,509 ****
--- 520,529 ----
mips3*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
;;
+ mmix*)
+ basic_machine=mmix-knuth
+ os=-mmixware
+ ;;
monitor)
basic_machine=m68k-rom68k
os=-coff
*************** case $basic_machine in
*** 512,517 ****
--- 532,541 ----
basic_machine=i386-unknown
os=-msdos
;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
ncr3000)
basic_machine=i486-ncr
os=-sysv4
*************** case $basic_machine in
*** 521,527 ****
os=-netbsd
;;
netwinder)
! basic_machine=armv4l-corel
os=-linux
;;
news | news700 | news800 | news900)
--- 545,551 ----
os=-netbsd
;;
netwinder)
! basic_machine=armv4l-rebel
os=-linux
;;
news | news700 | news800 | news900)
*************** case $basic_machine in
*** 601,610 ****
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
! pentium | p5 | k5 | nexen)
basic_machine=i586-pc
;;
! pentiumpro | p6 | k6 | 6x86)
basic_machine=i686-pc
;;
pentiumii | pentium2)
--- 625,634 ----
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
! pentium | p5 | k5 | k6 | nexen)
basic_machine=i586-pc
;;
! pentiumpro | p6 | 6x86)
basic_machine=i686-pc
;;
pentiumii | pentium2)
*************** case $basic_machine in
*** 716,721 ****
--- 740,749 ----
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
symmetry)
basic_machine=i386-sequent
os=-dynix
*************** case $os in
*** 905,916 ****
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
! | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
--- 933,944 ----
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
! | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
! | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
*************** case $os in
*** 924,929 ****
--- 952,960 ----
-sunos6*)
os=`echo $os | sed -e 's|sunos6|solaris3|'`
;;
+ -opened*)
+ os=-openedition
+ ;;
-osfrose*)
os=-osfrose
;;
*************** case $os in
*** 961,966 ****
--- 992,1000 ----
-oss*)
os=-sysv3
;;
+ -qnx)
+ os=-qnx4
+ ;;
-svr4)
os=-sysv4
;;
*************** case $basic_machine in
*** 1010,1016 ****
*-acorn)
os=-riscix1.2
;;
! arm*-corel)
os=-linux
;;
arm*-semi)
--- 1044,1050 ----
*-acorn)
os=-riscix1.2
;;
! arm*-rebel)
os=-linux
;;
arm*-semi)
*************** case $basic_machine in
*** 1184,1190 ****
-genix*)
vendor=ns
;;
! -mvs*)
vendor=ibm
;;
-ptx*)
--- 1218,1224 ----
-genix*)
vendor=ns
;;
! -mvs* | -opened*)
vendor=ibm
;;
-ptx*)