From ecd391e25aebf670c5948706049ad34b8973e868 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 10 Jun 2001 18:20:23 +0000 Subject: [PATCH] Added MacOS X Project Builder projects --- PBProjects.tar.gz | Bin 0 -> 31626 bytes README.MacOSX | 11 + config.guess | 758 ++++++++++++++++++++--------- config.sub | 283 ++++++++--- configure.in | 2 +- docs.html | 3 +- src/main/linux/SDL_main.c | 4 +- src/main/macosx/SDLMain.nib.tar.gz | Bin 1653 -> 0 bytes test/config.guess | 758 ++++++++++++++++++++--------- test/config.sub | 283 ++++++++--- 10 files changed, 1478 insertions(+), 624 deletions(-) create mode 100644 PBProjects.tar.gz delete mode 100644 src/main/macosx/SDLMain.nib.tar.gz diff --git a/PBProjects.tar.gz b/PBProjects.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..f63843bc106d69b8c76469d01b6c854bd6d0ba8a GIT binary patch literal 31626 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 Ofu1xweJ}?Iu>S|Jzf`0E literal 0 HcmV?d00001 diff --git a/README.MacOSX b/README.MacOSX index 745103f93..2c48c1323 100644 --- a/README.MacOSX +++ b/README.MacOSX @@ -40,6 +40,17 @@ Using the Simple DirectMedia Layer with Project Builder These instructions are for using Apple's Project Builder IDE to build SDL applications. +- First steps + +The first thing to do is to unpack the PBProjects.tar.gz archive in the +top level SDL directory (where the PBProjects.tar.gz archive resides). +Because Stuffit Expander will unpack the archive into a subdirectory, +you should unpack the archive manually from the command line: + cd [path_to_SDL_source] + tar zxf PBProjects.tar.gz +This will create a new folder called PBProjects, which you can browse +normally from the Finder. + - Building the Framework The SDL Library is packaged as a framework bundle, an organized diff --git a/config.guess b/config.guess index a9c631050..71de137a6 100755 --- a/config.guess +++ b/config.guess @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -# + +timestamp='2001-03-16' + # 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 # the Free Software Foundation; either version 2 of the License, or @@ -23,34 +25,93 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. -# Please send patches to the Autoconf mailing list . +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. -# 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 +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 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. + +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 + fi + ;; + ,,*) 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. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then @@ -59,15 +120,57 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +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-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) + 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 + ;; + *) + os=netbsd + ;; + esac + # 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}'` @@ -77,41 +180,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. cat <$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,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 + .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 - ./$dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac fi rm -f $dummy.s $dummy @@ -127,11 +240,8 @@ EOF echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 + echo m68k-unknown-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -156,13 +266,13 @@ EOF 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;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) @@ -218,15 +328,12 @@ EOF 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 ;; # 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 + # "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 @@ -250,15 +357,9 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${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 ;; @@ -271,9 +372,6 @@ EOF powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -289,6 +387,7 @@ EOF mips:*:*:UMIPS | mips:*:*:RISCos) sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -309,7 +408,7 @@ EOF 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 && exit 0 rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; @@ -328,15 +427,18 @@ EOF 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 + 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 + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -360,6 +462,14 @@ EOF i?86:AIX:*:*) echo i386-ibm-aix exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then sed 's/^ //' << EOF >$dummy.c @@ -373,7 +483,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + $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 @@ -382,9 +492,9 @@ EOF echo rs6000-ibm-aix3.2 fi exit 0 ;; - *:AIX:*:4) + *:AIX:*:[45]) 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 + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -392,7 +502,7 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; @@ -402,7 +512,7 @@ EOF ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + 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:*:*) @@ -418,11 +528,31 @@ EOF echo m68k-hp-bsd4.4 exit 0 ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 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 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + esac ;; + esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include @@ -453,12 +583,17 @@ EOF exit (0); } EOF - ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + (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 - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >$dummy.c #include @@ -485,7 +620,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + $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 ;; @@ -547,29 +682,30 @@ EOF -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + 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 t3e-cray-unicosmk${UNAME_RELEASE} + echo alphaev5-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 exit 0 ;; - F300:UNIX_System_V:*:*) + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - 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:*:* | i?86:BSD/OS:*:*) + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) @@ -579,17 +715,8 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - if test -x /usr/bin/objformat; then - if test "elf" = "`/usr/bin/objformat`"; then - echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` - 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 ;; @@ -599,6 +726,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:PW*:*) + 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 @@ -617,34 +747,41 @@ EOF *:GNU:*:*) 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. 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 - s/.*supported emulations: *// - 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 ;; - elf32arm) echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 ;; - elf32ppc) - # Determine Lib Version - cat >$dummy.c <$dummy.c < /* 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 +#ifdef __MIPSEL__ + printf ("%sel-unknown-linux-gnu\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 + ;; + ppc:Linux:*:*) + # Determine Lib Version + cat >$dummy.c < #if defined(__GLIBC__) extern char __libc_version[]; @@ -657,110 +794,130 @@ main(argc, argv) #if defined(__GLIBC__) printf("%s %s\n", __libc_version, __libc_release); #else - printf("unkown\n"); + printf("unknown\n"); #endif return 0; } 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 - sed 's/^ //' <$dummy.s + 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 ;; + alpha:Linux:*:*) + cat <$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,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 + 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 + 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 - ./$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 + LIBC="libc1" fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >$dummy.c </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. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >$dummy.c </dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i?86: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_supported_emulations=`cd /; ld --help 2>&1 \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` + case "$ld_supported_emulations" in + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + elf_i?86) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + esac + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. + # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. + # If ld does not provide *any* "supported emulations:" + # that means it is gnuoldld. + test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + case "${UNAME_MACHINE}" in + i?86) + VENDOR=pc; + ;; + *) + VENDOR=unknown; + ;; + esac + # Determine whether the default compiler is a.out or elf + cat >$dummy.c < #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -781,9 +938,10 @@ EOF 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 ;; + $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 + ;; # 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. i?86:DYNIX/ptx:4*:*) @@ -798,19 +956,21 @@ EOF 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_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 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 - (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + # 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 @@ -830,7 +990,11 @@ EOF 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 @@ -854,7 +1018,7 @@ EOF exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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 \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -877,9 +1041,12 @@ EOF TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; @@ -913,7 +1080,7 @@ EOF mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - news*:NEWS-OS:*:6*) + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) @@ -944,6 +1111,64 @@ EOF *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 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 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + 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 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1035,11 +1260,24 @@ main () #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -1050,7 +1288,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +$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. @@ -1083,6 +1321,48 @@ then esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/config.sub b/config.sub index 7904593b5..7146a2ffc 100755 --- a/config.sub +++ b/config.sub @@ -1,6 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. + +timestamp='2001-03-19' + # 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,6 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . +# # 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. @@ -45,30 +51,73 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,7 +143,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis) os= basic_machine=$1 ;; @@ -105,7 +154,7 @@ case $os in -scout) ;; -wrs) - os=vxworks + os=-vxworks basic_machine=$1 ;; -hiux*) @@ -156,33 +205,49 @@ case $os in -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 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ + | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ + | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ - | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | hppa64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp10 | pdp11 \ + | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el \ - | armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v) + | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ + | pj | pjl | h8500) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[34567]86) + i[234567]86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -191,24 +256,30 @@ case $basic_machine in 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]* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ + | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ | 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-7]-* | alphaev56-* | alphapca5[67]-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* \ - | armv[34][lb]-* \ - | f301-* | armv*-* | t3e-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ + | [cjt]90-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ + | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -245,14 +316,14 @@ case $basic_machine in os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) @@ -299,13 +370,16 @@ case $basic_machine in basic_machine=cray2-cray os=-unicos ;; - [ctj]90-cray) - basic_machine=c90-cray + [cjt]90) + basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) basic_machine=m68k-crds ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -353,6 +427,10 @@ case $basic_machine in basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -426,7 +504,6 @@ case $basic_machine in ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) @@ -453,14 +530,6 @@ case $basic_machine in basic_machine=i386-unknown os=-vsta ;; - i386-go32 | go32) - basic_machine=i386-unknown - os=-go32 - ;; - i386-mingw32 | mingw32) - basic_machine=i386-unknown - os=-mingw32 - ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -486,10 +555,14 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; miniframe) basic_machine=m68000-convergent ;; - *mint | *MiNT) + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; @@ -507,14 +580,22 @@ case $basic_machine in 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 ;; msdos) - basic_machine=i386-unknown + basic_machine=i386-pc os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -524,7 +605,7 @@ case $basic_machine in os=-netbsd ;; netwinder) - basic_machine=armv4l-corel + basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) @@ -572,9 +653,16 @@ case $basic_machine in basic_machine=i960-intel os=-mon960 ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -604,28 +692,28 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexen) + pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86) + pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) - basic_machine=i786-pc + basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; @@ -640,6 +728,10 @@ case $basic_machine in ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -719,6 +811,10 @@ case $basic_machine in sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix @@ -727,6 +823,10 @@ case $basic_machine in basic_machine=t3e-cray os=-unicos ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -822,12 +922,19 @@ case $basic_machine in vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; + sh3 | sh4) + basic_machine=sh-unknown + ;; sparc | sparcv9) basic_machine=sparc-sun ;; @@ -908,12 +1015,26 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` @@ -927,6 +1048,12 @@ case $os in -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -951,6 +1078,9 @@ case $os in -ns2 ) os=-nextstep2 ;; + -nsk*) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -985,7 +1115,7 @@ case $os in -xenix) os=-xenix ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -none) @@ -1013,12 +1143,15 @@ case $basic_machine in *-acorn) os=-riscix1.2 ;; - arm*-corel) + arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; + pdp10-*) + os=-tops20 + ;; pdp11-*) os=-none ;; @@ -1127,7 +1260,7 @@ case $basic_machine in *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) @@ -1187,7 +1320,7 @@ case $basic_machine in -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) @@ -1205,7 +1338,7 @@ case $basic_machine in -mpw* | -macos*) vendor=apple ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; esac @@ -1214,3 +1347,11 @@ case $basic_machine in esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/configure.in b/configure.in index 830e0bbca..f03942cbb 100644 --- a/configure.in +++ b/configure.in @@ -1865,7 +1865,7 @@ case "$target" in fi # The MacOS X platform requires special setup SDL_CFLAGS="$SDL_CFLAGS -F/System/Library/Frameworks/Carbon.framework" - SDL_LIBS="$SDL_LIBS -framework Carbon" + SDL_LIBS="-lSDLmain $SDL_LIBS -framework Carbon" ;; *) AC_MSG_ERROR(Unsupported target: Please add to configure.in) diff --git a/docs.html b/docs.html index f46e02dcb..5c1c85ef3 100644 --- a/docs.html +++ b/docs.html @@ -16,8 +16,9 @@

Major changes since SDL 1.0.0:

    -
  • 1.2.1: Disabled /dev/event joystick interface by default +
  • 1.2.1: Added MacOS X Project Builder projects (thanks Darrell!)
  • 1.2.1: Added initial support for Quartz video (thanks Darrell!) +
  • 1.2.1: Disabled Linux /dev/event joystick interface by default
  • 1.2.1: Added native OpenBSD audio driver (thanks vedge!)
  • 1.2.1: Added detection of Open Sound System on Solaris x86
  • 1.2.1: Added initial support for Nano-X (thanks Hsieh-Fu!) diff --git a/src/main/linux/SDL_main.c b/src/main/linux/SDL_main.c index 505949f20..ac1c939e3 100644 --- a/src/main/linux/SDL_main.c +++ b/src/main/linux/SDL_main.c @@ -5,9 +5,9 @@ #undef main #endif -extern int SDL_run(int argc, char **argv); +extern int SDL_main(int argc, char *argv[]); int main(int argc, char *argv[]) { - return(SDL_run(argc, argv)); + return(SDL_main(argc, argv)); } diff --git a/src/main/macosx/SDLMain.nib.tar.gz b/src/main/macosx/SDLMain.nib.tar.gz deleted file mode 100644 index a3da9a9b7e61617f1234b9eae77ce1f473a9daab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1653 zcmV-*28#I~iwFP!000001MOGcZ`)K9x9L8*uIma6USP;8NHD<~Cv}>BtxKA&Tcjo} za|_zjzO>SarcIP-eW=9PU%(4rLI@!t z1P^GOYv-#U(Rf(92mH%JuFgH@ch9-^oO7?)?%pUTNR5&(MC=r3nxO-JKm5~lpxODS zeT?((fS?0SUfSQp_!uw9y*|I6A^bb$Q5jOI#woDm1Sblr$}5%hKy7$w614nqs-4x||fL51c$d+2C!Y8z^3i%LzdmIoU8c&~u`t;Z$c$$Fc6d@WA>0)6_U@lSZ-U z*@4qhs$p0V`8JP7l;fN@Dyy1@om4eG>FE`Q6i%7+bPsf^o_<9h=M`~bYm-)CWN@wS#zLcjGyd`bal(|RFappUSQWit;2)mFs*6|xYx$?*jH5)F#LI1Y|hR zCH1PG3^HgKMqP}JbUC+UH>Ytr@tt8*7w$`9I_;>0VejOmBRoE1JQu{KhhuCsrEx$H$VKGG?07 z#^=@-FjMc$M1{+Ig4H;Uhbh=8_?fmB^LWkrC_Hv3{MtFe+RvShK72NPt6+l{tGf_m zomf>&ZJIVmbySdqq;SRdhfJCk2(lKeYTUSicWlpDUK}@#`3#v}gbjCSpzRme7C?aW>WFtz!z>*~p*}V*xnNso&Ga(1KM3}POEI5WPMU0Qwq#oO zbCzLQ!7W)>_DB>a0abQo@8(yFN$yOzYvd)-oP?O$z}}Sz|D*HSDMtU|Q=qjM5xPX2Ghq z2i_!as#M>E1dCcLAgV3~YTez;x3G}}R?lpq&Ej2kB&PKUZ$6HTDg=f*Rc)#5@f!4@ zz0mVu01YoffWmy{0M>db#>Rx9Fc>Sc2!9fEPFc~3Z|qj)OgXaWXN)T7SBul&{s9#- z4WCULKIR{8-N9iVl@<6F>rsFU+KrUpl!RSH{hY*$dBxRP@b%?UNNYQ*%i6A**SLo@ z_F|2^;J$5=lCTJJdy9!-9I+kkOKBpnm51=-t=WgTEE2rPkJ$YW^Q~doUi>+iUm$}c zdJ*1(!?KdZt&G!B3UsslG{X9I8@~y0c0bCz1{aL5auluW?@e#VG z6DIop3R=2|9_hqC=og(xqX#-Mi+*%3Qe1-1n#Mda-ik3&vqKvXSc@)i(XhA2B zq2F|34&7-(t2*%s%IM@P=)O)^=x3ey82zD>FQ7kll0rx)8_@4Mu?iY*WQa6GQ4gQZ za$M$m6fVh6$oMvRX7{)Y7cN}5aN)v*3l}b2xNzaZg$oxhTx`a_QPwl>04M+eXGbo6 diff --git a/test/config.guess b/test/config.guess index a9c631050..71de137a6 100644 --- a/test/config.guess +++ b/test/config.guess @@ -1,8 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -# + +timestamp='2001-03-16' + # 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 # the Free Software Foundation; either version 2 of the License, or @@ -23,34 +25,93 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. -# Please send patches to the Autoconf mailing list . +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and # exits with 0. Otherwise, it exits with 1. # # The plan is that this can be called by configure scripts if you -# don't specify an explicit system type (host/target name). -# -# Only a few systems have been added to this list; please add others -# (but try to keep the structure clean). -# +# don't specify an explicit build system type. -# 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 +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] + +Output the configuration name of the system \`$me' is run on. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.guess ($timestamp) + +Originally written by Per Bothner. +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" >&2 + exit 1 ;; + * ) + break ;; + esac +done + +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 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. + +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 + fi + ;; + ,,*) 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. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then @@ -59,15 +120,57 @@ fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +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-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) + 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 + ;; + *) + os=netbsd + ;; + esac + # 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}'` @@ -77,41 +180,51 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. cat <$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,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 + .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 - ./$dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac fi rm -f $dummy.s $dummy @@ -127,11 +240,8 @@ EOF echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 + echo m68k-unknown-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -156,13 +266,13 @@ EOF 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;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; - SR2?01:HI-UX/MPP:*:*) + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) @@ -218,15 +328,12 @@ EOF 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 ;; # 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 + # "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 @@ -250,15 +357,9 @@ EOF *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${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 ;; @@ -271,9 +372,6 @@ EOF powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -289,6 +387,7 @@ EOF mips:*:*:UMIPS | mips:*:*:RISCos) sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -309,7 +408,7 @@ EOF 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 && exit 0 rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; @@ -328,15 +427,18 @@ EOF 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 + 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 + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -360,6 +462,14 @@ EOF i?86:AIX:*:*) echo i386-ibm-aix exit 0 ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then sed 's/^ //' << EOF >$dummy.c @@ -373,7 +483,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + $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 @@ -382,9 +492,9 @@ EOF echo rs6000-ibm-aix3.2 fi exit 0 ;; - *:AIX:*:4) + *:AIX:*:[45]) 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 + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -392,7 +502,7 @@ EOF if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=4.${UNAME_RELEASE} + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} exit 0 ;; @@ -402,7 +512,7 @@ EOF ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + 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:*:*) @@ -418,11 +528,31 @@ EOF echo m68k-hp-bsd4.4 exit 0 ;; 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 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 + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + esac ;; + esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include @@ -453,12 +583,17 @@ EOF exit (0); } EOF - ($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + (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 - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit 0 ;; 3050*:HI-UX:*:*) sed 's/^ //' << EOF >$dummy.c #include @@ -485,7 +620,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + $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 ;; @@ -547,29 +682,30 @@ EOF -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + 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 t3e-cray-unicosmk${UNAME_RELEASE} + echo alphaev5-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 exit 0 ;; - F300:UNIX_System_V:*:*) + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; - 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:*:* | i?86:BSD/OS:*:*) + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; sparc*:BSD/OS:*:*) @@ -579,17 +715,8 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) - if test -x /usr/bin/objformat; then - if test "elf" = "`/usr/bin/objformat`"; then - echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'` - 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 ;; @@ -599,6 +726,9 @@ EOF i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:PW*:*) + 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 @@ -617,34 +747,41 @@ EOF *:GNU:*:*) 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. 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 - s/.*supported emulations: *// - 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 ;; - elf32arm) echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0 ;; - elf32ppc) - # Determine Lib Version - cat >$dummy.c <$dummy.c < /* 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 +#ifdef __MIPSEL__ + printf ("%sel-unknown-linux-gnu\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 + ;; + ppc:Linux:*:*) + # Determine Lib Version + cat >$dummy.c < #if defined(__GLIBC__) extern char __libc_version[]; @@ -657,110 +794,130 @@ main(argc, argv) #if defined(__GLIBC__) printf("%s %s\n", __libc_version, __libc_release); #else - printf("unkown\n"); + printf("unknown\n"); #endif return 0; } 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 - sed 's/^ //' <$dummy.s + 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 ;; + alpha:Linux:*:*) + cat <$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,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 + 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 + 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 - ./$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 + LIBC="libc1" fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 - elif test "${UNAME_MACHINE}" = "mips" ; then - cat >$dummy.c </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. - # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. - # If ld does not provide *any* "supported emulations:" - # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 - - case "${UNAME_MACHINE}" in - i?86) - VENDOR=pc; - ;; - *) - VENDOR=unknown; - ;; - esac - # Determine whether the default compiler is a.out or elf - cat >$dummy.c </dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit 0 ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit 0 ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit 0 ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit 0 ;; + i?86: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_supported_emulations=`cd /; ld --help 2>&1 \ + | sed -ne '/supported emulations:/!d + s/[ ][ ]*/ /g + s/.*supported emulations: *// + s/ .*// + p'` + case "$ld_supported_emulations" in + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + elf_i?86) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + esac + # Either a pre-BFD a.out linker (linux-gnuoldld) + # or one that does not give us useful --help. + # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. + # If ld does not provide *any* "supported emulations:" + # that means it is gnuoldld. + test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + case "${UNAME_MACHINE}" in + i?86) + VENDOR=pc; + ;; + *) + VENDOR=unknown; + ;; + esac + # Determine whether the default compiler is a.out or elf + cat >$dummy.c < #ifdef __cplusplus +#include /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { @@ -781,9 +938,10 @@ EOF 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 ;; + $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 + ;; # 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. i?86:DYNIX/ptx:4*:*) @@ -798,19 +956,21 @@ EOF 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_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 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 - (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585 - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE} + # 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 @@ -830,7 +990,11 @@ EOF 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 @@ -854,7 +1018,7 @@ EOF exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.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 \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -877,9 +1041,12 @@ EOF TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} exit 0 ;; - rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*) + rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} exit 0 ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; @@ -913,7 +1080,7 @@ EOF mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - news*:NEWS-OS:*:6*) + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) @@ -944,6 +1111,64 @@ EOF *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 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 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + 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 + exit 0 ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit 0 ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit 0 ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit 0 ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit 0 ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1035,11 +1260,24 @@ main () #endif #if defined (vax) -#if !defined (ultrix) - printf ("vax-dec-bsd\n"); exit (0); -#else - printf ("vax-dec-ultrix\n"); exit (0); -#endif +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif #endif #if defined (alliant) && defined (i860) @@ -1050,7 +1288,7 @@ main () } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +$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. @@ -1083,6 +1321,48 @@ then esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF exit 1 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/test/config.sub b/test/config.sub index 7904593b5..7146a2ffc 100644 --- a/test/config.sub +++ b/test/config.sub @@ -1,6 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. + +timestamp='2001-03-19' + # 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,6 +29,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . +# # 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. @@ -45,30 +51,73 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS + $0 [OPTION] ALIAS + +Canonicalize a configuration name. + +Operation modes: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to ." + +version="\ +GNU config.sub ($timestamp) + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; + --version | -v ) + echo "$version" ; exit 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo $1 + exit 0;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu*) + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,7 +143,7 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis) os= basic_machine=$1 ;; @@ -105,7 +154,7 @@ case $os in -scout) ;; -wrs) - os=vxworks + os=-vxworks basic_machine=$1 ;; -hiux*) @@ -156,33 +205,49 @@ case $os in -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 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ + | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \ + | pyramid | mn10200 | mn10300 | tron | a29k \ | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ - | alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \ - | we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \ - | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | hppa64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp10 | pdp11 \ + | mips16 | mips64 | mipsel | mips64el \ | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ - | mips64vr5000 | miprs64vr5000el \ - | armv[34][lb] | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ - | thumb | d10v) + | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ + | pj | pjl | h8500) + basic_machine=$basic_machine-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12) + # Motorola 68HC11/12. basic_machine=$basic_machine-unknown + os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. - i[34567]86) + i[234567]86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -191,24 +256,30 @@ case $basic_machine in 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]* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ + | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ + | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ | 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-7]-* | alphaev56-* | alphapca5[67]-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | clipper-* | orion-* \ - | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ + | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ | mips64el-* | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ - | mipstx39-* | mipstx39el-* \ - | armv[34][lb]-* \ - | f301-* | armv*-* | t3e-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ + | [cjt]90-* \ | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ - | thumb-* | v850-* | d30v-* | tic30-* | c30-* ) + | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \ + | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -245,14 +316,14 @@ case $basic_machine in os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) @@ -299,13 +370,16 @@ case $basic_machine in basic_machine=cray2-cray os=-unicos ;; - [ctj]90-cray) - basic_machine=c90-cray + [cjt]90) + basic_machine=${basic_machine}-cray os=-unicos ;; crds | unos) basic_machine=m68k-crds ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -353,6 +427,10 @@ case $basic_machine in basic_machine=tron-gmicro os=-sysv ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; h3050r* | hiux*) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -426,7 +504,6 @@ case $basic_machine in ;; i370-ibm* | ibm*) basic_machine=i370-ibm - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) @@ -453,14 +530,6 @@ case $basic_machine in basic_machine=i386-unknown os=-vsta ;; - i386-go32 | go32) - basic_machine=i386-unknown - os=-go32 - ;; - i386-mingw32 | mingw32) - basic_machine=i386-unknown - os=-mingw32 - ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -486,10 +555,14 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; + mingw32) + basic_machine=i386-pc + os=-mingw32 + ;; miniframe) basic_machine=m68000-convergent ;; - *mint | *MiNT) + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; @@ -507,14 +580,22 @@ case $basic_machine in 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 ;; msdos) - basic_machine=i386-unknown + basic_machine=i386-pc os=-msdos ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -524,7 +605,7 @@ case $basic_machine in os=-netbsd ;; netwinder) - basic_machine=armv4l-corel + basic_machine=armv4l-rebel os=-linux ;; news | news700 | news800 | news900) @@ -572,9 +653,16 @@ case $basic_machine in basic_machine=i960-intel os=-mon960 ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) basic_machine=np1-gould ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -604,28 +692,28 @@ case $basic_machine in pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexen) + pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86) + pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) - basic_machine=i786-pc + basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; @@ -640,6 +728,10 @@ case $basic_machine in ps2) basic_machine=i386-ibm ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -719,6 +811,10 @@ case $basic_machine in sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix @@ -727,6 +823,10 @@ case $basic_machine in basic_machine=t3e-cray os=-unicos ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -822,12 +922,19 @@ case $basic_machine in vax) basic_machine=vax-dec ;; + pdp10) + # there are many clones, so DEC is not a safe bet + basic_machine=pdp10-unknown + ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; + sh3 | sh4) + basic_machine=sh-unknown + ;; sparc | sparcv9) basic_machine=sparc-sun ;; @@ -908,12 +1015,26 @@ case $os in | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*) + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mon960* | -lnews*) + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` @@ -927,6 +1048,12 @@ case $os in -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -951,6 +1078,9 @@ case $os in -ns2 ) os=-nextstep2 ;; + -nsk*) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -985,7 +1115,7 @@ case $os in -xenix) os=-xenix ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -none) @@ -1013,12 +1143,15 @@ case $basic_machine in *-acorn) os=-riscix1.2 ;; - arm*-corel) + arm*-rebel) os=-linux ;; arm*-semi) os=-aout ;; + pdp10-*) + os=-tops20 + ;; pdp11-*) os=-none ;; @@ -1127,7 +1260,7 @@ case $basic_machine in *-masscomp) os=-rtu ;; - f301-fujitsu) + f30[01]-fujitsu | f700-fujitsu) os=-uxpv ;; *-rom68k) @@ -1187,7 +1320,7 @@ case $basic_machine in -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) @@ -1205,7 +1338,7 @@ case $basic_machine in -mpw* | -macos*) vendor=apple ;; - -*mint | -*MiNT) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; esac @@ -1214,3 +1347,11 @@ case $basic_machine in esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: