summaryrefslogtreecommitdiff
path: root/config.guess
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-07-25 14:40:22 +1000
committerDamien Miller <djm@mindrot.org>2002-07-25 14:40:22 +1000
commita7609f548f2e0be63abe740d7dbdd7d8a4a17eeb (patch)
treee898640d1ed1525b050e38d9166682b0b4812b49 /config.guess
parent6d8d78827eeec670932247ebfde7bfe13adf7540 (diff)
- (djm) Latest config.guess and config.sub from ftp://ftp.gnu.org/gnu/config/
Diffstat (limited to 'config.guess')
-rwxr-xr-xconfig.guess141
1 files changed, 84 insertions, 57 deletions
diff --git a/config.guess b/config.guess
index 83c544d97..fd30ab031 100755
--- a/config.guess
+++ b/config.guess
@@ -3,7 +3,7 @@
3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 3# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4# 2000, 2001, 2002 Free Software Foundation, Inc. 4# 2000, 2001, 2002 Free Software Foundation, Inc.
5 5
6timestamp='2002-01-30' 6timestamp='2002-07-23'
7 7
8# This file is free software; you can redistribute it and/or modify it 8# This file is free software; you can redistribute it and/or modify it
9# under the terms of the GNU General Public License as published by 9# under the terms of the GNU General Public License as published by
@@ -88,30 +88,40 @@ if test $# != 0; then
88 exit 1 88 exit 1
89fi 89fi
90 90
91trap 'exit 1' 1 2 15
91 92
92dummy=dummy-$$ 93# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
93trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 94# compiler to aid in system detection is discouraged as it requires
95# temporary files to be created and, as you can see below, it is a
96# headache to deal with in a portable fashion.
94 97
95# CC_FOR_BUILD -- compiler used by this script.
96# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still 98# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
97# use `HOST_CC' if defined, but it is deprecated. 99# use `HOST_CC' if defined, but it is deprecated.
98 100
99set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in 101# This shell variable is my proudest work .. or something. --bje
100 ,,) echo "int dummy(){}" > $dummy.c ; 102
101 for c in cc gcc c89 ; do 103set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ;
102 ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; 104(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old)
103 if test $? = 0 ; then 105 || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ;
106dummy=$tmpdir/dummy ;
107files="$dummy.c $dummy.o $dummy.rel $dummy" ;
108trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ;
109case $CC_FOR_BUILD,$HOST_CC,$CC in
110 ,,) echo "int x;" > $dummy.c ;
111 for c in cc gcc c89 c99 ; do
112 if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then
104 CC_FOR_BUILD="$c"; break ; 113 CC_FOR_BUILD="$c"; break ;
105 fi ; 114 fi ;
106 done ; 115 done ;
107 rm -f $dummy.c $dummy.o $dummy.rel ; 116 rm -f $files ;
108 if test x"$CC_FOR_BUILD" = x ; then 117 if test x"$CC_FOR_BUILD" = x ; then
109 CC_FOR_BUILD=no_compiler_found ; 118 CC_FOR_BUILD=no_compiler_found ;
110 fi 119 fi
111 ;; 120 ;;
112 ,,*) CC_FOR_BUILD=$CC ;; 121 ,,*) CC_FOR_BUILD=$CC ;;
113 ,*,*) CC_FOR_BUILD=$HOST_CC ;; 122 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
114esac' 123esac ;
124unset files'
115 125
116# This is needed to find uname on a Pyramid OSx when run in the BSD universe. 126# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
117# (ghazi@noc.rutgers.edu 1994-08-24) 127# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,9 +148,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
138 # 148 #
139 # Note: NetBSD doesn't particularly care about the vendor 149 # Note: NetBSD doesn't particularly care about the vendor
140 # portion of the name. We always set it to "unknown". 150 # portion of the name. We always set it to "unknown".
141 UNAME_MACHINE_ARCH=`(uname -p) 2>/dev/null` || \ 151 sysctl="sysctl -n hw.machine_arch"
142 UNAME_MACHINE_ARCH=unknown 152 UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
153 /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
143 case "${UNAME_MACHINE_ARCH}" in 154 case "${UNAME_MACHINE_ARCH}" in
155 armeb) machine=armeb-unknown ;;
144 arm*) machine=arm-unknown ;; 156 arm*) machine=arm-unknown ;;
145 sh3el) machine=shl-unknown ;; 157 sh3el) machine=shl-unknown ;;
146 sh3eb) machine=sh-unknown ;; 158 sh3eb) machine=sh-unknown ;;
@@ -219,6 +231,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
219 # A Tn.n version is a released field test version. 231 # A Tn.n version is a released field test version.
220 # A Xn.n version is an unreleased experimental baselevel. 232 # A Xn.n version is an unreleased experimental baselevel.
221 # 1.2 uses "1.2" for uname -r. 233 # 1.2 uses "1.2" for uname -r.
234 eval $set_cc_for_build
222 cat <<EOF >$dummy.s 235 cat <<EOF >$dummy.s
223 .data 236 .data
224\$Lformat: 237\$Lformat:
@@ -244,10 +257,9 @@ main:
244 jsr \$26,exit 257 jsr \$26,exit
245 .end main 258 .end main
246EOF 259EOF
247 eval $set_cc_for_build
248 $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null 260 $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
249 if test "$?" = 0 ; then 261 if test "$?" = 0 ; then
250 case `./$dummy` in 262 case `$dummy` in
251 0-0) 263 0-0)
252 UNAME_MACHINE="alpha" 264 UNAME_MACHINE="alpha"
253 ;; 265 ;;
@@ -269,9 +281,12 @@ EOF
269 2-1307) 281 2-1307)
270 UNAME_MACHINE="alphaev68" 282 UNAME_MACHINE="alphaev68"
271 ;; 283 ;;
284 3-1307)
285 UNAME_MACHINE="alphaev7"
286 ;;
272 esac 287 esac
273 fi 288 fi
274 rm -f $dummy.s $dummy 289 rm -f $dummy.s $dummy && rmdir $tmpdir
275 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 290 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
276 exit 0 ;; 291 exit 0 ;;
277 Alpha\ *:Windows_NT*:*) 292 Alpha\ *:Windows_NT*:*)
@@ -312,6 +327,10 @@ EOF
312 NILE*:*:*:dcosx) 327 NILE*:*:*:dcosx)
313 echo pyramid-pyramid-svr4 328 echo pyramid-pyramid-svr4
314 exit 0 ;; 329 exit 0 ;;
330 DRS?6000:UNIX_SV:4.2*:7*)
331 case `/usr/bin/uname -p` in
332 sparc) echo sparc-icl-nx7 && exit 0 ;;
333 esac ;;
315 sun4H:SunOS:5.*:*) 334 sun4H:SunOS:5.*:*)
316 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 335 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
317 exit 0 ;; 336 exit 0 ;;
@@ -340,7 +359,7 @@ EOF
340 echo m68k-sun-sunos${UNAME_RELEASE} 359 echo m68k-sun-sunos${UNAME_RELEASE}
341 exit 0 ;; 360 exit 0 ;;
342 sun*:*:4.2BSD:*) 361 sun*:*:4.2BSD:*)
343 UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 362 UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
344 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 363 test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
345 case "`/bin/arch`" in 364 case "`/bin/arch`" in
346 sun3) 365 sun3)
@@ -419,14 +438,17 @@ EOF
419 } 438 }
420EOF 439EOF
421 $CC_FOR_BUILD $dummy.c -o $dummy \ 440 $CC_FOR_BUILD $dummy.c -o $dummy \
422 && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ 441 && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
423 && rm -f $dummy.c $dummy && exit 0 442 && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
424 rm -f $dummy.c $dummy 443 rm -f $dummy.c $dummy && rmdir $tmpdir
425 echo mips-mips-riscos${UNAME_RELEASE} 444 echo mips-mips-riscos${UNAME_RELEASE}
426 exit 0 ;; 445 exit 0 ;;
427 Motorola:PowerMAX_OS:*:*) 446 Motorola:PowerMAX_OS:*:*)
428 echo powerpc-motorola-powermax 447 echo powerpc-motorola-powermax
429 exit 0 ;; 448 exit 0 ;;
449 Night_Hawk:*:*:PowerMAX_OS)
450 echo powerpc-harris-powermax
451 exit 0 ;;
430 Night_Hawk:Power_UNIX:*:*) 452 Night_Hawk:Power_UNIX:*:*)
431 echo powerpc-harris-powerunix 453 echo powerpc-harris-powerunix
432 exit 0 ;; 454 exit 0 ;;
@@ -499,8 +521,8 @@ EOF
499 exit(0); 521 exit(0);
500 } 522 }
501EOF 523EOF
502 $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 524 $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
503 rm -f $dummy.c $dummy 525 rm -f $dummy.c $dummy && rmdir $tmpdir
504 echo rs6000-ibm-aix3.2.5 526 echo rs6000-ibm-aix3.2.5
505 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then 527 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
506 echo rs6000-ibm-aix3.2.4 528 echo rs6000-ibm-aix3.2.4
@@ -509,7 +531,7 @@ EOF
509 fi 531 fi
510 exit 0 ;; 532 exit 0 ;;
511 *:AIX:*:[45]) 533 *:AIX:*:[45])
512 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` 534 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
513 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 535 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
514 IBM_ARCH=rs6000 536 IBM_ARCH=rs6000
515 else 537 else
@@ -598,9 +620,9 @@ EOF
598 exit (0); 620 exit (0);
599 } 621 }
600EOF 622EOF
601 (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` 623 (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy`
602 if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi 624 if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
603 rm -f $dummy.c $dummy 625 rm -f $dummy.c $dummy && rmdir $tmpdir
604 fi ;; 626 fi ;;
605 esac 627 esac
606 echo ${HP_ARCH}-hp-hpux${HPUX_REV} 628 echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -636,8 +658,8 @@ EOF
636 exit (0); 658 exit (0);
637 } 659 }
638EOF 660EOF
639 $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 661 $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
640 rm -f $dummy.c $dummy 662 rm -f $dummy.c $dummy && rmdir $tmpdir
641 echo unknown-hitachi-hiuxwe2 663 echo unknown-hitachi-hiuxwe2
642 exit 0 ;; 664 exit 0 ;;
643 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 665 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -683,9 +705,6 @@ EOF
683 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) 705 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
684 echo c4-convex-bsd 706 echo c4-convex-bsd
685 exit 0 ;; 707 exit 0 ;;
686 CRAY*X-MP:*:*:*)
687 echo xmp-cray-unicos
688 exit 0 ;;
689 CRAY*Y-MP:*:*:*) 708 CRAY*Y-MP:*:*:*)
690 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 709 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
691 exit 0 ;; 710 exit 0 ;;
@@ -707,9 +726,6 @@ EOF
707 CRAY*SV1:*:*:*) 726 CRAY*SV1:*:*:*)
708 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 727 echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
709 exit 0 ;; 728 exit 0 ;;
710 CRAY-2:*:*:*)
711 echo cray2-cray-unicos
712 exit 0 ;;
713 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 729 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
714 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 730 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
715 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 731 FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
@@ -726,7 +742,19 @@ EOF
726 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 742 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
727 exit 0 ;; 743 exit 0 ;;
728 *:FreeBSD:*:*) 744 *:FreeBSD:*:*)
729 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 745 # Determine whether the default compiler uses glibc.
746 eval $set_cc_for_build
747 sed 's/^ //' << EOF >$dummy.c
748 #include <features.h>
749 #if __GLIBC__ >= 2
750 LIBC=gnu
751 #else
752 LIBC=
753 #endif
754EOF
755 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
756 rm -f $dummy.c && rmdir $tmpdir
757 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
730 exit 0 ;; 758 exit 0 ;;
731 i*:CYGWIN*:*) 759 i*:CYGWIN*:*)
732 echo ${UNAME_MACHINE}-pc-cygwin 760 echo ${UNAME_MACHINE}-pc-cygwin
@@ -765,7 +793,7 @@ EOF
765 echo ${UNAME_MACHINE}-unknown-linux-gnu 793 echo ${UNAME_MACHINE}-unknown-linux-gnu
766 exit 0 ;; 794 exit 0 ;;
767 ia64:Linux:*:*) 795 ia64:Linux:*:*)
768 echo ${UNAME_MACHINE}-unknown-linux 796 echo ${UNAME_MACHINE}-unknown-linux-gnu
769 exit 0 ;; 797 exit 0 ;;
770 m68*:Linux:*:*) 798 m68*:Linux:*:*)
771 echo ${UNAME_MACHINE}-unknown-linux-gnu 799 echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -776,18 +804,18 @@ EOF
776 #undef CPU 804 #undef CPU
777 #undef mips 805 #undef mips
778 #undef mipsel 806 #undef mipsel
779 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 807 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
780 CPU=mipsel 808 CPU=mipsel
781 #else 809 #else
782 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 810 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
783 CPU=mips 811 CPU=mips
784 #else 812 #else
785 CPU= 813 CPU=
786 #endif 814 #endif
787 #endif 815 #endif
788EOF 816EOF
789 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 817 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
790 rm -f $dummy.c 818 rm -f $dummy.c && rmdir $tmpdir
791 test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 819 test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
792 ;; 820 ;;
793 ppc:Linux:*:*) 821 ppc:Linux:*:*)
@@ -837,9 +865,8 @@ EOF
837 # The BFD linker knows what the default object file format is, so 865 # The BFD linker knows what the default object file format is, so
838 # first see if it will tell us. cd to the root directory to prevent 866 # first see if it will tell us. cd to the root directory to prevent
839 # problems with other programs or directories called `ld' in the path. 867 # problems with other programs or directories called `ld' in the path.
840 # Export LANG=C to prevent ld from outputting information in other 868 # Set LC_ALL=C to ensure ld outputs messages in English.
841 # languages. 869 ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
842 ld_supported_targets=`LANG=C; export LANG; cd /; ld --help 2>&1 \
843 | sed -ne '/supported targets:/!d 870 | sed -ne '/supported targets:/!d
844 s/[ ][ ]*/ /g 871 s/[ ][ ]*/ /g
845 s/.*supported targets: *// 872 s/.*supported targets: *//
@@ -851,7 +878,7 @@ EOF
851 ;; 878 ;;
852 a.out-i386-linux) 879 a.out-i386-linux)
853 echo "${UNAME_MACHINE}-pc-linux-gnuaout" 880 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
854 exit 0 ;; 881 exit 0 ;;
855 coff-i386) 882 coff-i386)
856 echo "${UNAME_MACHINE}-pc-linux-gnucoff" 883 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
857 exit 0 ;; 884 exit 0 ;;
@@ -884,7 +911,7 @@ EOF
884 #endif 911 #endif
885EOF 912EOF
886 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 913 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
887 rm -f $dummy.c 914 rm -f $dummy.c && rmdir $tmpdir
888 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 915 test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
889 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 916 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
890 ;; 917 ;;
@@ -923,13 +950,13 @@ EOF
923 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` 950 UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
924 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL 951 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
925 elif /bin/uname -X 2>/dev/null >/dev/null ; then 952 elif /bin/uname -X 2>/dev/null >/dev/null ; then
926 UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` 953 UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
927 (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 954 (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
928 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ 955 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
929 && UNAME_MACHINE=i586 956 && UNAME_MACHINE=i586
930 (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ 957 (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
931 && UNAME_MACHINE=i686 958 && UNAME_MACHINE=i686
932 (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ 959 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
933 && UNAME_MACHINE=i686 960 && UNAME_MACHINE=i686
934 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL 961 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
935 else 962 else
@@ -964,7 +991,7 @@ EOF
964 exit 0 ;; 991 exit 0 ;;
965 M68*:*:R3V[567]*:*) 992 M68*:*:R3V[567]*:*)
966 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; 993 test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
967 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) 994 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
968 OS_REL='' 995 OS_REL=''
969 test -r /etc/.relid \ 996 test -r /etc/.relid \
970 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 997 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1065,12 +1092,12 @@ EOF
1065 echo `uname -p`-apple-darwin${UNAME_RELEASE} 1092 echo `uname -p`-apple-darwin${UNAME_RELEASE}
1066 exit 0 ;; 1093 exit 0 ;;
1067 *:procnto*:*:* | *:QNX:[0123456789]*:*) 1094 *:procnto*:*:* | *:QNX:[0123456789]*:*)
1068 if test "${UNAME_MACHINE}" = "x86pc"; then 1095 UNAME_PROCESSOR=`uname -p`
1096 if test "$UNAME_PROCESSOR" = "x86"; then
1097 UNAME_PROCESSOR=i386
1069 UNAME_MACHINE=pc 1098 UNAME_MACHINE=pc
1070 echo i386-${UNAME_MACHINE}-nto-qnx
1071 else
1072 echo `uname -p`-${UNAME_MACHINE}-nto-qnx
1073 fi 1099 fi
1100 echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
1074 exit 0 ;; 1101 exit 0 ;;
1075 *:QNX:*:4*) 1102 *:QNX:*:4*)
1076 echo i386-pc-qnx 1103 echo i386-pc-qnx
@@ -1247,8 +1274,8 @@ main ()
1247} 1274}
1248EOF 1275EOF
1249 1276
1250$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 1277$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0
1251rm -f $dummy.c $dummy 1278rm -f $dummy.c $dummy && rmdir $tmpdir
1252 1279
1253# Apollos put the system type in the environment. 1280# Apollos put the system type in the environment.
1254 1281