Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 24cfc14

Browse files
peterepetere
committed
New config.guess and config.sub
1 parent 152a101 commit 24cfc14

File tree

2 files changed

+109
-64
lines changed

2 files changed

+109
-64
lines changed

‎config/config.guess

+63-42
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#! /bin/sh
22
# Attempt to guess a canonical system name.
33
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4-
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
4+
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
55

6-
timestamp='2003-10-16'
6+
timestamp='2004-09-07'
77

88
# This file is free software; you can redistribute it and/or modify it
99
# under the terms of the GNU General Public License as published by
@@ -53,7 +53,7 @@ version="\
5353
GNU config.guess ($timestamp)
5454
5555
Originally written by Per Bothner.
56-
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
56+
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
5757
Free Software Foundation, Inc.
5858
5959
This is free software; see the source for copying conditions. There is NO
@@ -197,15 +197,21 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
197197
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
198198
echo "${machine}-${os}${release}"
199199
exit 0 ;;
200+
amd64:OpenBSD:*:*)
201+
echo x86_64-unknown-openbsd${UNAME_RELEASE}
202+
exit 0 ;;
200203
amiga:OpenBSD:*:*)
201204
echo m68k-unknown-openbsd${UNAME_RELEASE}
202205
exit 0 ;;
203-
arc:OpenBSD:*:*)
204-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
206+
cats:OpenBSD:*:*)
207+
echo arm-unknown-openbsd${UNAME_RELEASE}
205208
exit 0 ;;
206209
hp300:OpenBSD:*:*)
207210
echo m68k-unknown-openbsd${UNAME_RELEASE}
208211
exit 0 ;;
212+
luna88k:OpenBSD:*:*)
213+
echo m88k-unknown-openbsd${UNAME_RELEASE}
214+
exit 0 ;;
209215
mac68k:OpenBSD:*:*)
210216
echo m68k-unknown-openbsd${UNAME_RELEASE}
211217
exit 0 ;;
@@ -221,28 +227,33 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
221227
mvmeppc:OpenBSD:*:*)
222228
echo powerpc-unknown-openbsd${UNAME_RELEASE}
223229
exit 0 ;;
224-
pegasos:OpenBSD:*:*)
225-
echo powerpc-unknown-openbsd${UNAME_RELEASE}
226-
exit 0 ;;
227-
pmax:OpenBSD:*:*)
228-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
229-
exit 0 ;;
230230
sgi:OpenBSD:*:*)
231-
echo mipseb-unknown-openbsd${UNAME_RELEASE}
231+
echo mips64-unknown-openbsd${UNAME_RELEASE}
232232
exit 0 ;;
233233
sun3:OpenBSD:*:*)
234234
echo m68k-unknown-openbsd${UNAME_RELEASE}
235235
exit 0 ;;
236-
wgrisc:OpenBSD:*:*)
237-
echo mipsel-unknown-openbsd${UNAME_RELEASE}
238-
exit 0 ;;
239236
*:OpenBSD:*:*)
240237
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
241238
exit 0 ;;
239+
*:ekkoBSD:*:*)
240+
echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
241+
exit 0 ;;
242+
macppc:MirBSD:*:*)
243+
echo powerppc-unknown-mirbsd${UNAME_RELEASE}
244+
exit 0 ;;
245+
*:MirBSD:*:*)
246+
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
247+
exit 0 ;;
242248
alpha:OSF1:*:*)
243-
if test $UNAME_RELEASE = "V4.0"; then
249+
case $UNAME_RELEASE in
250+
*4.0)
244251
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
245-
fi
252+
;;
253+
*5.*)
254+
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
255+
;;
256+
esac
246257
# According to Compaq, /usr/sbin/psrinfo has been available on
247258
# OSF/1 and Tru64 systems produced since 1995. I hope that
248259
# covers most systems running today. This code pipes the CPU
@@ -280,14 +291,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
280291
"EV7.9 (21364A)")
281292
UNAME_MACHINE="alphaev79" ;;
282293
esac
294+
# A Pn.n version is a patched version.
283295
# A Vn.n version is a released version.
284296
# A Tn.n version is a released field test version.
285297
# A Xn.n version is an unreleased experimental baselevel.
286298
# 1.2 uses "1.2" for uname -r.
287-
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
288-
exit 0 ;;
289-
Alpha*:OpenVMS:*:*)
290-
echo alpha-hp-vms
299+
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
291300
exit 0 ;;
292301
Alpha\ *:Windows_NT*:*)
293302
# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -405,6 +414,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
405414
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
406415
echo m68k-unknown-mint${UNAME_RELEASE}
407416
exit 0 ;;
417+
m68k:machten:*:*)
418+
echo m68k-apple-machten${UNAME_RELEASE}
419+
exit 0 ;;
408420
powerpc:machten:*:*)
409421
echo powerpc-apple-machten${UNAME_RELEASE}
410422
exit 0 ;;
@@ -740,7 +752,7 @@ EOF
740752
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
741753
exit 0 ;;
742754
*:UNICOS/mp:*:*)
743-
echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
755+
echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
744756
exit 0 ;;
745757
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
746758
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
@@ -763,21 +775,7 @@ EOF
763775
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
764776
exit 0 ;;
765777
*:FreeBSD:*:*)
766-
# Determine whether the default compiler uses glibc.
767-
eval $set_cc_for_build
768-
sed 's/^ //' << EOF >$dummy.c
769-
#include <features.h>
770-
#if __GLIBC__ >= 2
771-
LIBC=gnu
772-
#else
773-
LIBC=
774-
#endif
775-
EOF
776-
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
777-
# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
778-
# FreeBSD's kernel, but not the complete OS.
779-
case ${LIBC} in gnu) kernel_only='k' ;; esac
780-
echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
778+
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
781779
exit 0 ;;
782780
i*:CYGWIN*:*)
783781
echo ${UNAME_MACHINE}-pc-cygwin
@@ -826,9 +824,18 @@ EOF
826824
cris:Linux:*:*)
827825
echo cris-axis-linux-gnu
828826
exit 0 ;;
827+
crisv32:Linux:*:*)
828+
echo crisv32-axis-linux-gnu
829+
exit 0 ;;
830+
frv:Linux:*:*)
831+
echo frv-unknown-linux-gnu
832+
exit 0 ;;
829833
ia64:Linux:*:*)
830834
echo ${UNAME_MACHINE}-unknown-linux-gnu
831835
exit 0 ;;
836+
m32r*:Linux:*:*)
837+
echo ${UNAME_MACHINE}-unknown-linux-gnu
838+
exit 0 ;;
832839
m68*:Linux:*:*)
833840
echo ${UNAME_MACHINE}-unknown-linux-gnu
834841
exit 0 ;;
@@ -997,6 +1004,9 @@ EOF
9971004
i*86:atheos:*:*)
9981005
echo ${UNAME_MACHINE}-unknown-atheos
9991006
exit 0 ;;
1007+
i*86:syllable:*:*)
1008+
echo ${UNAME_MACHINE}-pc-syllable
1009+
exit 0 ;;
10001010
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
10011011
echo i386-unknown-lynxos${UNAME_RELEASE}
10021012
exit 0 ;;
@@ -1066,9 +1076,9 @@ EOF
10661076
M680?0:D-NIX:5.3:*)
10671077
echo m68k-diab-dnix
10681078
exit 0 ;;
1069-
M68*:*:R3V[567]*:*)
1079+
M68*:*:R3V[5678]*:*)
10701080
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
1071-
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
1081+
3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
10721082
OS_REL=''
10731083
test -r /etc/.relid \
10741084
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1166,9 +1176,10 @@ EOF
11661176
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
11671177
exit 0 ;;
11681178
*:Darwin:*:*)
1169-
case `uname -p` in
1179+
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1180+
case $UNAME_PROCESSOR in
11701181
*86) UNAME_PROCESSOR=i686 ;;
1171-
powerpc) UNAME_PROCESSOR=powerpc ;;
1182+
unknown) UNAME_PROCESSOR=powerpc ;;
11721183
esac
11731184
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
11741185
exit 0 ;;
@@ -1183,7 +1194,7 @@ EOF
11831194
*:QNX:*:4*)
11841195
echo i386-pc-qnx
11851196
exit 0 ;;
1186-
NSR-[DGKLNPTVWY]:NONSTOP_KERNEL:*:*)
1197+
NSR-?:NONSTOP_KERNEL:*:*)
11871198
echo nsr-tandem-nsk${UNAME_RELEASE}
11881199
exit 0 ;;
11891200
*:NonStop-UX:*:*)
@@ -1227,6 +1238,16 @@ EOF
12271238
SEI:*:*:SEIUX)
12281239
echo mips-sei-seiux${UNAME_RELEASE}
12291240
exit 0 ;;
1241+
*:DragonFly:*:*)
1242+
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
1243+
exit 0 ;;
1244+
*:*VMS:*:*)
1245+
UNAME_MACHINE=`(uname -p) 2>/dev/null`
1246+
case "${UNAME_MACHINE}" in
1247+
A*) echo alpha-dec-vms && exit 0 ;;
1248+
I*) echo ia64-dec-vms && exit 0 ;;
1249+
V*) echo vax-dec-vms && exit 0 ;;
1250+
esac
12301251
esac
12311252

12321253
#echo '(No uname command or uname output not recognized.)' 1>&2

0 commit comments

Comments
 (0)