summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2009-07-24 17:45:10 +0000
committerColin Watson <cjwatson@debian.org>2009-07-24 17:45:10 +0000
commit61845adf608a38dbf1e3cf4db49f409d438e3391 (patch)
tree9064950f4a47757b07b2e5661a6513ee5b65881d
parenta44d917b8cb713be4d0cd7356d98f40f5382c82a (diff)
Update config.guess and config.sub from autotools-dev 20090611.1
(closes: #538301).
-rwxr-xr-xconfig.guess240
-rwxr-xr-xconfig.sub221
-rw-r--r--debian/changelog7
3 files changed, 316 insertions, 152 deletions
diff --git a/config.guess b/config.guess
index 6d71f752f..e3a2116a7 100755
--- a/config.guess
+++ b/config.guess
@@ -1,9 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Attempt to guess a canonical system name. 2# Attempt to guess a canonical system name.
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, 2003, 2004, 2005 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc.
5 6
6timestamp='2005-05-27' 7timestamp='2009-06-10'
7 8
8# This file is free software; you can redistribute it and/or modify it 9# 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 10# under the terms of the GNU General Public License as published by
@@ -55,8 +56,8 @@ version="\
55GNU config.guess ($timestamp) 56GNU config.guess ($timestamp)
56 57
57Originally written by Per Bothner. 58Originally written by Per Bothner.
58Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 59Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
59Free Software Foundation, Inc. 602002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
60 61
61This is free software; see the source for copying conditions. There is NO 62This is free software; see the source for copying conditions. There is NO
62warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 63warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -106,7 +107,7 @@ set_cc_for_build='
106trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; 107trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
107trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; 108trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
108: ${TMPDIR=/tmp} ; 109: ${TMPDIR=/tmp} ;
109 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || 110 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
110 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || 111 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
111 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || 112 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
112 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; 113 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -125,7 +126,7 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in
125 ;; 126 ;;
126 ,,*) CC_FOR_BUILD=$CC ;; 127 ,,*) CC_FOR_BUILD=$CC ;;
127 ,*,*) CC_FOR_BUILD=$HOST_CC ;; 128 ,*,*) CC_FOR_BUILD=$HOST_CC ;;
128esac ;' 129esac ; set_cc_for_build= ;'
129 130
130# This is needed to find uname on a Pyramid OSx when run in the BSD universe. 131# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
131# (ghazi@noc.rutgers.edu 1994-08-24) 132# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -160,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
160 arm*) machine=arm-unknown ;; 161 arm*) machine=arm-unknown ;;
161 sh3el) machine=shl-unknown ;; 162 sh3el) machine=shl-unknown ;;
162 sh3eb) machine=sh-unknown ;; 163 sh3eb) machine=sh-unknown ;;
164 sh5el) machine=sh5le-unknown ;;
163 *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 165 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
164 esac 166 esac
165 # The Operating System including object format, if it has switched 167 # The Operating System including object format, if it has switched
@@ -168,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
168 arm*|i386|m68k|ns32k|sh3*|sparc|vax) 170 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
169 eval $set_cc_for_build 171 eval $set_cc_for_build
170 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 172 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
171 | grep __ELF__ >/dev/null 173 | grep -q __ELF__
172 then 174 then
173 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). 175 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
174 # Return netbsd for either. FIX? 176 # Return netbsd for either. FIX?
@@ -199,50 +201,18 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
199 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 201 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
200 echo "${machine}-${os}${release}" 202 echo "${machine}-${os}${release}"
201 exit ;; 203 exit ;;
202 amd64:OpenBSD:*:*)
203 echo x86_64-unknown-openbsd${UNAME_RELEASE}
204 exit ;;
205 amiga:OpenBSD:*:*)
206 echo m68k-unknown-openbsd${UNAME_RELEASE}
207 exit ;;
208 cats:OpenBSD:*:*)
209 echo arm-unknown-openbsd${UNAME_RELEASE}
210 exit ;;
211 hp300:OpenBSD:*:*)
212 echo m68k-unknown-openbsd${UNAME_RELEASE}
213 exit ;;
214 luna88k:OpenBSD:*:*)
215 echo m88k-unknown-openbsd${UNAME_RELEASE}
216 exit ;;
217 mac68k:OpenBSD:*:*)
218 echo m68k-unknown-openbsd${UNAME_RELEASE}
219 exit ;;
220 macppc:OpenBSD:*:*)
221 echo powerpc-unknown-openbsd${UNAME_RELEASE}
222 exit ;;
223 mvme68k:OpenBSD:*:*)
224 echo m68k-unknown-openbsd${UNAME_RELEASE}
225 exit ;;
226 mvme88k:OpenBSD:*:*)
227 echo m88k-unknown-openbsd${UNAME_RELEASE}
228 exit ;;
229 mvmeppc:OpenBSD:*:*)
230 echo powerpc-unknown-openbsd${UNAME_RELEASE}
231 exit ;;
232 sgi:OpenBSD:*:*)
233 echo mips64-unknown-openbsd${UNAME_RELEASE}
234 exit ;;
235 sun3:OpenBSD:*:*)
236 echo m68k-unknown-openbsd${UNAME_RELEASE}
237 exit ;;
238 *:OpenBSD:*:*) 204 *:OpenBSD:*:*)
239 echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} 205 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
206 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
240 exit ;; 207 exit ;;
241 *:ekkoBSD:*:*) 208 *:ekkoBSD:*:*)
242 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 209 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
243 exit ;; 210 exit ;;
211 *:SolidBSD:*:*)
212 echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
213 exit ;;
244 macppc:MirBSD:*:*) 214 macppc:MirBSD:*:*)
245 echo powerppc-unknown-mirbsd${UNAME_RELEASE} 215 echo powerpc-unknown-mirbsd${UNAME_RELEASE}
246 exit ;; 216 exit ;;
247 *:MirBSD:*:*) 217 *:MirBSD:*:*)
248 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 218 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -354,14 +324,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
354 case `/usr/bin/uname -p` in 324 case `/usr/bin/uname -p` in
355 sparc) echo sparc-icl-nx7; exit ;; 325 sparc) echo sparc-icl-nx7; exit ;;
356 esac ;; 326 esac ;;
327 s390x:SunOS:*:*)
328 echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
329 exit ;;
357 sun4H:SunOS:5.*:*) 330 sun4H:SunOS:5.*:*)
358 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 331 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
359 exit ;; 332 exit ;;
360 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 333 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
361 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 334 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
362 exit ;; 335 exit ;;
363 i86pc:SunOS:5.*:*) 336 i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
364 echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 337 eval $set_cc_for_build
338 SUN_ARCH="i386"
339 # If there is a compiler, see if it is configured for 64-bit objects.
340 # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
341 # This test works for both compilers.
342 if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
343 if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
344 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
345 grep IS_64BIT_ARCH >/dev/null
346 then
347 SUN_ARCH="x86_64"
348 fi
349 fi
350 echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
365 exit ;; 351 exit ;;
366 sun4*:SunOS:6*:*) 352 sun4*:SunOS:6*:*)
367 # According to config.sub, this is the proper way to canonicalize 353 # According to config.sub, this is the proper way to canonicalize
@@ -562,7 +548,7 @@ EOF
562 echo rs6000-ibm-aix3.2 548 echo rs6000-ibm-aix3.2
563 fi 549 fi
564 exit ;; 550 exit ;;
565 *:AIX:*:[45]) 551 *:AIX:*:[456])
566 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 552 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
567 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 553 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
568 IBM_ARCH=rs6000 554 IBM_ARCH=rs6000
@@ -658,8 +644,7 @@ EOF
658 esac 644 esac
659 if [ ${HP_ARCH} = "hppa2.0w" ] 645 if [ ${HP_ARCH} = "hppa2.0w" ]
660 then 646 then
661 # avoid double evaluation of $set_cc_for_build 647 eval $set_cc_for_build
662 test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
663 648
664 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating 649 # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
665 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler 650 # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
@@ -671,7 +656,7 @@ EOF
671 # => hppa64-hp-hpux11.23 656 # => hppa64-hp-hpux11.23
672 657
673 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 658 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
674 grep __LP64__ >/dev/null 659 grep -q __LP64__
675 then 660 then
676 HP_ARCH="hppa2.0w" 661 HP_ARCH="hppa2.0w"
677 else 662 else
@@ -800,12 +785,19 @@ EOF
800 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 785 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
801 exit ;; 786 exit ;;
802 *:FreeBSD:*:*) 787 *:FreeBSD:*:*)
803 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 788 case ${UNAME_MACHINE} in
789 pc98)
790 echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
791 amd64)
792 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
793 *)
794 echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
795 esac
804 exit ;; 796 exit ;;
805 i*:CYGWIN*:*) 797 i*:CYGWIN*:*)
806 echo ${UNAME_MACHINE}-pc-cygwin 798 echo ${UNAME_MACHINE}-pc-cygwin
807 exit ;; 799 exit ;;
808 i*:MINGW*:*) 800 *:MINGW*:*)
809 echo ${UNAME_MACHINE}-pc-mingw32 801 echo ${UNAME_MACHINE}-pc-mingw32
810 exit ;; 802 exit ;;
811 i*:windows32*:*) 803 i*:windows32*:*)
@@ -815,12 +807,24 @@ EOF
815 i*:PW*:*) 807 i*:PW*:*)
816 echo ${UNAME_MACHINE}-pc-pw32 808 echo ${UNAME_MACHINE}-pc-pw32
817 exit ;; 809 exit ;;
818 x86:Interix*:[34]*) 810 *:Interix*:[3456]*)
819 echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 811 case ${UNAME_MACHINE} in
820 exit ;; 812 x86)
813 echo i586-pc-interix${UNAME_RELEASE}
814 exit ;;
815 EM64T | authenticamd | genuineintel)
816 echo x86_64-unknown-interix${UNAME_RELEASE}
817 exit ;;
818 IA64)
819 echo ia64-unknown-interix${UNAME_RELEASE}
820 exit ;;
821 esac ;;
821 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 822 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
822 echo i${UNAME_MACHINE}-pc-mks 823 echo i${UNAME_MACHINE}-pc-mks
823 exit ;; 824 exit ;;
825 8664:Windows_NT:*)
826 echo x86_64-pc-mks
827 exit ;;
824 i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 828 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
825 # How do we know it's Interix rather than the generic POSIX subsystem? 829 # How do we know it's Interix rather than the generic POSIX subsystem?
826 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 830 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -830,7 +834,7 @@ EOF
830 i*:UWIN*:*) 834 i*:UWIN*:*)
831 echo ${UNAME_MACHINE}-pc-uwin 835 echo ${UNAME_MACHINE}-pc-uwin
832 exit ;; 836 exit ;;
833 amd64:CYGWIN*:*:*) 837 amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
834 echo x86_64-unknown-cygwin 838 echo x86_64-unknown-cygwin
835 exit ;; 839 exit ;;
836 p*:CYGWIN*:*) 840 p*:CYGWIN*:*)
@@ -851,6 +855,16 @@ EOF
851 echo ${UNAME_MACHINE}-pc-minix 855 echo ${UNAME_MACHINE}-pc-minix
852 exit ;; 856 exit ;;
853 arm*:Linux:*:*) 857 arm*:Linux:*:*)
858 eval $set_cc_for_build
859 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
860 | grep -q __ARM_EABI__
861 then
862 echo ${UNAME_MACHINE}-unknown-linux-gnu
863 else
864 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
865 fi
866 exit ;;
867 avr32*:Linux:*:*)
854 echo ${UNAME_MACHINE}-unknown-linux-gnu 868 echo ${UNAME_MACHINE}-unknown-linux-gnu
855 exit ;; 869 exit ;;
856 cris:Linux:*:*) 870 cris:Linux:*:*)
@@ -871,44 +885,32 @@ EOF
871 m68*:Linux:*:*) 885 m68*:Linux:*:*)
872 echo ${UNAME_MACHINE}-unknown-linux-gnu 886 echo ${UNAME_MACHINE}-unknown-linux-gnu
873 exit ;; 887 exit ;;
874 mips:Linux:*:*) 888 mips:Linux:*:* | mips64:Linux:*:*)
875 eval $set_cc_for_build 889 eval $set_cc_for_build
876 sed 's/^ //' << EOF >$dummy.c 890 sed 's/^ //' << EOF >$dummy.c
877 #undef CPU 891 #undef CPU
878 #undef mips 892 #undef ${UNAME_MACHINE}
879 #undef mipsel 893 #undef ${UNAME_MACHINE}el
880 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 894 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
881 CPU=mipsel 895 CPU=${UNAME_MACHINE}el
882 #else 896 #else
883 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 897 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
884 CPU=mips 898 CPU=${UNAME_MACHINE}
885 #else 899 #else
886 CPU= 900 CPU=
887 #endif 901 #endif
888 #endif 902 #endif
889EOF 903EOF
890 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 904 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
891 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 905 /^CPU/{
892 ;; 906 s: ::g
893 mips64:Linux:*:*) 907 p
894 eval $set_cc_for_build 908 }'`"
895 sed 's/^ //' << EOF >$dummy.c
896 #undef CPU
897 #undef mips64
898 #undef mips64el
899 #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
900 CPU=mips64el
901 #else
902 #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
903 CPU=mips64
904 #else
905 CPU=
906 #endif
907 #endif
908EOF
909 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
910 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 909 test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
911 ;; 910 ;;
911 or32:Linux:*:*)
912 echo or32-unknown-linux-gnu
913 exit ;;
912 ppc:Linux:*:*) 914 ppc:Linux:*:*)
913 echo powerpc-unknown-linux-gnu 915 echo powerpc-unknown-linux-gnu
914 exit ;; 916 exit ;;
@@ -925,10 +927,13 @@ EOF
925 EV67) UNAME_MACHINE=alphaev67 ;; 927 EV67) UNAME_MACHINE=alphaev67 ;;
926 EV68*) UNAME_MACHINE=alphaev68 ;; 928 EV68*) UNAME_MACHINE=alphaev68 ;;
927 esac 929 esac
928 objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null 930 objdump --private-headers /bin/sh | grep -q ld.so.1
929 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi 931 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
930 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} 932 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
931 exit ;; 933 exit ;;
934 padre:Linux:*:*)
935 echo sparc-unknown-linux-gnu
936 exit ;;
932 parisc:Linux:*:* | hppa:Linux:*:*) 937 parisc:Linux:*:* | hppa:Linux:*:*)
933 # Look for CPU level 938 # Look for CPU level
934 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 939 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -952,9 +957,15 @@ EOF
952 sparc:Linux:*:* | sparc64:Linux:*:*) 957 sparc:Linux:*:* | sparc64:Linux:*:*)
953 echo ${UNAME_MACHINE}-unknown-linux-gnu 958 echo ${UNAME_MACHINE}-unknown-linux-gnu
954 exit ;; 959 exit ;;
960 vax:Linux:*:*)
961 echo ${UNAME_MACHINE}-dec-linux-gnu
962 exit ;;
955 x86_64:Linux:*:*) 963 x86_64:Linux:*:*)
956 echo x86_64-unknown-linux-gnu 964 echo x86_64-unknown-linux-gnu
957 exit ;; 965 exit ;;
966 xtensa*:Linux:*:*)
967 echo ${UNAME_MACHINE}-unknown-linux-gnu
968 exit ;;
958 i*86:Linux:*:*) 969 i*86:Linux:*:*)
959 # The BFD linker knows what the default object file format is, so 970 # The BFD linker knows what the default object file format is, so
960 # first see if it will tell us. cd to the root directory to prevent 971 # first see if it will tell us. cd to the root directory to prevent
@@ -970,17 +981,6 @@ EOF
970 elf32-i386) 981 elf32-i386)
971 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" 982 TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
972 ;; 983 ;;
973 a.out-i386-linux)
974 echo "${UNAME_MACHINE}-pc-linux-gnuaout"
975 exit ;;
976 coff-i386)
977 echo "${UNAME_MACHINE}-pc-linux-gnucoff"
978 exit ;;
979 "")
980 # Either a pre-BFD a.out linker (linux-gnuoldld) or
981 # one that does not give us useful --help.
982 echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
983 exit ;;
984 esac 984 esac
985 # Determine whether the default compiler is a.out or elf 985 # Determine whether the default compiler is a.out or elf
986 eval $set_cc_for_build 986 eval $set_cc_for_build
@@ -997,7 +997,7 @@ EOF
997 LIBC=gnulibc1 997 LIBC=gnulibc1
998 # endif 998 # endif
999 #else 999 #else
1000 #ifdef __INTEL_COMPILER 1000 #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
1001 LIBC=gnu 1001 LIBC=gnu
1002 #else 1002 #else
1003 LIBC=gnuaout 1003 LIBC=gnuaout
@@ -1007,7 +1007,11 @@ EOF
1007 LIBC=dietlibc 1007 LIBC=dietlibc
1008 #endif 1008 #endif
1009EOF 1009EOF
1010 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 1010 eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
1011 /^LIBC/{
1012 s: ::g
1013 p
1014 }'`"
1011 test x"${LIBC}" != x && { 1015 test x"${LIBC}" != x && {
1012 echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 1016 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
1013 exit 1017 exit
@@ -1042,7 +1046,7 @@ EOF
1042 i*86:syllable:*:*) 1046 i*86:syllable:*:*)
1043 echo ${UNAME_MACHINE}-pc-syllable 1047 echo ${UNAME_MACHINE}-pc-syllable
1044 exit ;; 1048 exit ;;
1045 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) 1049 i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
1046 echo i386-unknown-lynxos${UNAME_RELEASE} 1050 echo i386-unknown-lynxos${UNAME_RELEASE}
1047 exit ;; 1051 exit ;;
1048 i*86:*DOS:*:*) 1052 i*86:*DOS:*:*)
@@ -1086,8 +1090,11 @@ EOF
1086 pc:*:*:*) 1090 pc:*:*:*)
1087 # Left here for compatibility: 1091 # Left here for compatibility:
1088 # uname -m prints for DJGPP always 'pc', but it prints nothing about 1092 # uname -m prints for DJGPP always 'pc', but it prints nothing about
1089 # the processor, so we play safe by assuming i386. 1093 # the processor, so we play safe by assuming i586.
1090 echo i386-pc-msdosdjgpp 1094 # Note: whatever this is, it MUST be the same as what config.sub
1095 # prints for the "djgpp" host, or else GDB configury will decide that
1096 # this is a cross-build.
1097 echo i586-pc-msdosdjgpp
1091 exit ;; 1098 exit ;;
1092 Intel:Mach:3*:*) 1099 Intel:Mach:3*:*)
1093 echo i386-pc-mach3 1100 echo i386-pc-mach3
@@ -1125,6 +1132,16 @@ EOF
1125 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 1132 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
1126 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 1133 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1127 && { echo i486-ncr-sysv4; exit; } ;; 1134 && { echo i486-ncr-sysv4; exit; } ;;
1135 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
1136 OS_REL='.3'
1137 test -r /etc/.relid \
1138 && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
1139 /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
1140 && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
1141 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
1142 && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
1143 /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
1144 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
1128 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 1145 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
1129 echo m68k-unknown-lynxos${UNAME_RELEASE} 1146 echo m68k-unknown-lynxos${UNAME_RELEASE}
1130 exit ;; 1147 exit ;;
@@ -1137,7 +1154,7 @@ EOF
1137 rs6000:LynxOS:2.*:*) 1154 rs6000:LynxOS:2.*:*)
1138 echo rs6000-unknown-lynxos${UNAME_RELEASE} 1155 echo rs6000-unknown-lynxos${UNAME_RELEASE}
1139 exit ;; 1156 exit ;;
1140 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) 1157 PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
1141 echo powerpc-unknown-lynxos${UNAME_RELEASE} 1158 echo powerpc-unknown-lynxos${UNAME_RELEASE}
1142 exit ;; 1159 exit ;;
1143 SM[BE]S:UNIX_SV:*:*) 1160 SM[BE]S:UNIX_SV:*:*)
@@ -1200,6 +1217,9 @@ EOF
1200 BePC:BeOS:*:*) # BeOS running on Intel PC compatible. 1217 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
1201 echo i586-pc-beos 1218 echo i586-pc-beos
1202 exit ;; 1219 exit ;;
1220 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
1221 echo i586-pc-haiku
1222 exit ;;
1203 SX-4:SUPER-UX:*:*) 1223 SX-4:SUPER-UX:*:*)
1204 echo sx4-nec-superux${UNAME_RELEASE} 1224 echo sx4-nec-superux${UNAME_RELEASE}
1205 exit ;; 1225 exit ;;
@@ -1209,6 +1229,15 @@ EOF
1209 SX-6:SUPER-UX:*:*) 1229 SX-6:SUPER-UX:*:*)
1210 echo sx6-nec-superux${UNAME_RELEASE} 1230 echo sx6-nec-superux${UNAME_RELEASE}
1211 exit ;; 1231 exit ;;
1232 SX-7:SUPER-UX:*:*)
1233 echo sx7-nec-superux${UNAME_RELEASE}
1234 exit ;;
1235 SX-8:SUPER-UX:*:*)
1236 echo sx8-nec-superux${UNAME_RELEASE}
1237 exit ;;
1238 SX-8R:SUPER-UX:*:*)
1239 echo sx8r-nec-superux${UNAME_RELEASE}
1240 exit ;;
1212 Power*:Rhapsody:*:*) 1241 Power*:Rhapsody:*:*)
1213 echo powerpc-apple-rhapsody${UNAME_RELEASE} 1242 echo powerpc-apple-rhapsody${UNAME_RELEASE}
1214 exit ;; 1243 exit ;;
@@ -1218,7 +1247,6 @@ EOF
1218 *:Darwin:*:*) 1247 *:Darwin:*:*)
1219 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 1248 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
1220 case $UNAME_PROCESSOR in 1249 case $UNAME_PROCESSOR in
1221 *86) UNAME_PROCESSOR=i686 ;;
1222 unknown) UNAME_PROCESSOR=powerpc ;; 1250 unknown) UNAME_PROCESSOR=powerpc ;;
1223 esac 1251 esac
1224 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 1252 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@@ -1297,6 +1325,12 @@ EOF
1297 i*86:skyos:*:*) 1325 i*86:skyos:*:*)
1298 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' 1326 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
1299 exit ;; 1327 exit ;;
1328 i*86:rdos:*:*)
1329 echo ${UNAME_MACHINE}-pc-rdos
1330 exit ;;
1331 i*86:AROS:*:*)
1332 echo ${UNAME_MACHINE}-pc-aros
1333 exit ;;
1300esac 1334esac
1301 1335
1302#echo '(No uname command or uname output not recognized.)' 1>&2 1336#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1457,9 +1491,9 @@ This script, last modified $timestamp, has failed to recognize
1457the operating system you are using. It is advised that you 1491the operating system you are using. It is advised that you
1458download the most up to date version of the config scripts from 1492download the most up to date version of the config scripts from
1459 1493
1460 http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess 1494 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
1461and 1495and
1462 http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub 1496 http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
1463 1497
1464If the version you run ($0) is already up to date, please 1498If the version you run ($0) is already up to date, please
1465send the following data and any information you think might be 1499send the following data and any information you think might be
diff --git a/config.sub b/config.sub
index 519f2cd00..eb0389a69 100755
--- a/config.sub
+++ b/config.sub
@@ -1,9 +1,10 @@
1#! /bin/sh 1#! /bin/sh
2# Configuration validation subroutine script. 2# Configuration validation subroutine script.
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, 2003, 2004, 2005 Free Software Foundation, Inc. 4# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
5# Free Software Foundation, Inc.
5 6
6timestamp='2005-05-12' 7timestamp='2009-06-11'
7 8
8# This file is (in principle) common to ALL GNU software. 9# This file is (in principle) common to ALL GNU software.
9# The presence of a machine in this file suggests that SOME GNU software 10# The presence of a machine in this file suggests that SOME GNU software
@@ -71,8 +72,8 @@ Report bugs and patches to <config-patches@gnu.org>."
71version="\ 72version="\
72GNU config.sub ($timestamp) 73GNU config.sub ($timestamp)
73 74
74Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 75Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
75Free Software Foundation, Inc. 762002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
76 77
77This is free software; see the source for copying conditions. There is NO 78This is free software; see the source for copying conditions. There is NO
78warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." 79warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -119,8 +120,10 @@ esac
119# Here we must recognize all the valid KERNEL-OS combinations. 120# Here we must recognize all the valid KERNEL-OS combinations.
120maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 121maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
121case $maybe_os in 122case $maybe_os in
122 nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ 123 nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
123 kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 124 uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
125 kopensolaris*-gnu* | \
126 storm-chaos* | os2-emx* | rtmk-nova*)
124 os=-$maybe_os 127 os=-$maybe_os
125 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 128 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
126 ;; 129 ;;
@@ -150,6 +153,9 @@ case $os in
150 os= 153 os=
151 basic_machine=$1 154 basic_machine=$1
152 ;; 155 ;;
156 -bluegene*)
157 os=-cnk
158 ;;
153 -sim | -cisco | -oki | -wec | -winbond) 159 -sim | -cisco | -oki | -wec | -winbond)
154 os= 160 os=
155 basic_machine=$1 161 basic_machine=$1
@@ -171,6 +177,10 @@ case $os in
171 -hiux*) 177 -hiux*)
172 os=-hiuxwe2 178 os=-hiuxwe2
173 ;; 179 ;;
180 -sco6)
181 os=-sco5v6
182 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
183 ;;
174 -sco5) 184 -sco5)
175 os=-sco3.2v5 185 os=-sco3.2v5
176 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 186 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -187,6 +197,10 @@ case $os in
187 # Don't forget version if it is 3.2v4 or newer. 197 # Don't forget version if it is 3.2v4 or newer.
188 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 198 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
189 ;; 199 ;;
200 -sco5v6*)
201 # Don't forget version if it is 3.2v4 or newer.
202 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
203 ;;
190 -sco*) 204 -sco*)
191 os=-sco3.2v2 205 os=-sco3.2v2
192 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 206 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -231,23 +245,28 @@ case $basic_machine in
231 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ 245 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
232 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 246 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
233 | am33_2.0 \ 247 | am33_2.0 \
234 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ 248 | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
235 | bfin \ 249 | bfin \
236 | c4x | clipper \ 250 | c4x | clipper \
237 | d10v | d30v | dlx | dsp16xx \ 251 | d10v | d30v | dlx | dsp16xx \
238 | fr30 | frv \ 252 | fido | fr30 | frv \
239 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 253 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
240 | i370 | i860 | i960 | ia64 \ 254 | i370 | i860 | i960 | ia64 \
241 | ip2k | iq2000 \ 255 | ip2k | iq2000 \
242 | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ 256 | lm32 \
257 | m32c | m32r | m32rle | m68000 | m68k | m88k \
258 | maxq | mb | microblaze | mcore | mep | metag \
243 | mips | mipsbe | mipseb | mipsel | mipsle \ 259 | mips | mipsbe | mipseb | mipsel | mipsle \
244 | mips16 \ 260 | mips16 \
245 | mips64 | mips64el \ 261 | mips64 | mips64el \
246 | mips64vr | mips64vrel \ 262 | mips64octeon | mips64octeonel \
247 | mips64orion | mips64orionel \ 263 | mips64orion | mips64orionel \
264 | mips64r5900 | mips64r5900el \
265 | mips64vr | mips64vrel \
248 | mips64vr4100 | mips64vr4100el \ 266 | mips64vr4100 | mips64vr4100el \
249 | mips64vr4300 | mips64vr4300el \ 267 | mips64vr4300 | mips64vr4300el \
250 | mips64vr5000 | mips64vr5000el \ 268 | mips64vr5000 | mips64vr5000el \
269 | mips64vr5900 | mips64vr5900el \
251 | mipsisa32 | mipsisa32el \ 270 | mipsisa32 | mipsisa32el \
252 | mipsisa32r2 | mipsisa32r2el \ 271 | mipsisa32r2 | mipsisa32r2el \
253 | mipsisa64 | mipsisa64el \ 272 | mipsisa64 | mipsisa64el \
@@ -256,22 +275,26 @@ case $basic_machine in
256 | mipsisa64sr71k | mipsisa64sr71kel \ 275 | mipsisa64sr71k | mipsisa64sr71kel \
257 | mipstx39 | mipstx39el \ 276 | mipstx39 | mipstx39el \
258 | mn10200 | mn10300 \ 277 | mn10200 | mn10300 \
278 | moxie \
279 | mt \
259 | msp430 \ 280 | msp430 \
281 | nios | nios2 \
260 | ns16k | ns32k \ 282 | ns16k | ns32k \
261 | openrisc | or32 \ 283 | or32 \
262 | pdp10 | pdp11 | pj | pjl \ 284 | pdp10 | pdp11 | pj | pjl \
263 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 285 | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
264 | pyramid \ 286 | pyramid \
265 | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 287 | score \
288 | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
266 | sh64 | sh64le \ 289 | sh64 | sh64le \
267 | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ 290 | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
268 | sparcv8 | sparcv9 | sparcv9b \ 291 | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
269 | strongarm \ 292 | spu | strongarm \
270 | tahoe | thumb | tic4x | tic80 | tron \ 293 | tahoe | thumb | tic4x | tic80 | tron \
271 | v850 | v850e \ 294 | v850 | v850e \
272 | we32k \ 295 | we32k \
273 | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ 296 | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
274 | z8k) 297 | z8k | z80)
275 basic_machine=$basic_machine-unknown 298 basic_machine=$basic_machine-unknown
276 ;; 299 ;;
277 m6811 | m68hc11 | m6812 | m68hc12) 300 m6811 | m68hc11 | m6812 | m68hc12)
@@ -281,6 +304,9 @@ case $basic_machine in
281 ;; 304 ;;
282 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 305 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
283 ;; 306 ;;
307 ms1)
308 basic_machine=mt-unknown
309 ;;
284 310
285 # We use `pc' rather than `unknown' 311 # We use `pc' rather than `unknown'
286 # because (1) that's what they normally are, and 312 # because (1) that's what they normally are, and
@@ -300,28 +326,32 @@ case $basic_machine in
300 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ 326 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
301 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 327 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
302 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ 328 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
303 | avr-* \ 329 | avr-* | avr32-* \
304 | bfin-* | bs2000-* \ 330 | bfin-* | bs2000-* \
305 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ 331 | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
306 | clipper-* | craynv-* | cydra-* \ 332 | clipper-* | craynv-* | cydra-* \
307 | d10v-* | d30v-* | dlx-* \ 333 | d10v-* | d30v-* | dlx-* \
308 | elxsi-* \ 334 | elxsi-* \
309 | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ 335 | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
310 | h8300-* | h8500-* \ 336 | h8300-* | h8500-* \
311 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 337 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
312 | i*86-* | i860-* | i960-* | ia64-* \ 338 | i*86-* | i860-* | i960-* | ia64-* \
313 | ip2k-* | iq2000-* \ 339 | ip2k-* | iq2000-* \
314 | m32r-* | m32rle-* \ 340 | lm32-* \
341 | m32c-* | m32r-* | m32rle-* \
315 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 342 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
316 | m88110-* | m88k-* | maxq-* | mcore-* \ 343 | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
317 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ 344 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
318 | mips16-* \ 345 | mips16-* \
319 | mips64-* | mips64el-* \ 346 | mips64-* | mips64el-* \
320 | mips64vr-* | mips64vrel-* \ 347 | mips64octeon-* | mips64octeonel-* \
321 | mips64orion-* | mips64orionel-* \ 348 | mips64orion-* | mips64orionel-* \
349 | mips64r5900-* | mips64r5900el-* \
350 | mips64vr-* | mips64vrel-* \
322 | mips64vr4100-* | mips64vr4100el-* \ 351 | mips64vr4100-* | mips64vr4100el-* \
323 | mips64vr4300-* | mips64vr4300el-* \ 352 | mips64vr4300-* | mips64vr4300el-* \
324 | mips64vr5000-* | mips64vr5000el-* \ 353 | mips64vr5000-* | mips64vr5000el-* \
354 | mips64vr5900-* | mips64vr5900el-* \
325 | mipsisa32-* | mipsisa32el-* \ 355 | mipsisa32-* | mipsisa32el-* \
326 | mipsisa32r2-* | mipsisa32r2el-* \ 356 | mipsisa32r2-* | mipsisa32r2el-* \
327 | mipsisa64-* | mipsisa64el-* \ 357 | mipsisa64-* | mipsisa64el-* \
@@ -330,27 +360,33 @@ case $basic_machine in
330 | mipsisa64sr71k-* | mipsisa64sr71kel-* \ 360 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
331 | mipstx39-* | mipstx39el-* \ 361 | mipstx39-* | mipstx39el-* \
332 | mmix-* \ 362 | mmix-* \
363 | mt-* \
333 | msp430-* \ 364 | msp430-* \
365 | nios-* | nios2-* \
334 | none-* | np1-* | ns16k-* | ns32k-* \ 366 | none-* | np1-* | ns16k-* | ns32k-* \
335 | orion-* \ 367 | orion-* \
336 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 368 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
337 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ 369 | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
338 | pyramid-* \ 370 | pyramid-* \
339 | romp-* | rs6000-* \ 371 | romp-* | rs6000-* \
340 | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ 372 | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
341 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 373 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
342 | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ 374 | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
343 | sparclite-* \ 375 | sparclite-* \
344 | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ 376 | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
345 | tahoe-* | thumb-* \ 377 | tahoe-* | thumb-* \
346 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 378 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
347 | tron-* \ 379 | tron-* \
348 | v850-* | v850e-* | vax-* \ 380 | v850-* | v850e-* | vax-* \
349 | we32k-* \ 381 | we32k-* \
350 | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ 382 | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
351 | xstormy16-* | xtensa-* \ 383 | xstormy16-* | xtensa*-* \
352 | ymp-* \ 384 | ymp-* \
353 | z8k-*) 385 | z8k-* | z80-*)
386 ;;
387 # Recognize the basic CPU types without company name, with glob match.
388 xtensa*)
389 basic_machine=$basic_machine-unknown
354 ;; 390 ;;
355 # Recognize the various machine names and aliases which stand 391 # Recognize the various machine names and aliases which stand
356 # for a CPU type and a company and sometimes even an OS. 392 # for a CPU type and a company and sometimes even an OS.
@@ -414,6 +450,10 @@ case $basic_machine in
414 basic_machine=m68k-apollo 450 basic_machine=m68k-apollo
415 os=-bsd 451 os=-bsd
416 ;; 452 ;;
453 aros)
454 basic_machine=i386-pc
455 os=-aros
456 ;;
417 aux) 457 aux)
418 basic_machine=m68k-apple 458 basic_machine=m68k-apple
419 os=-aux 459 os=-aux
@@ -422,10 +462,26 @@ case $basic_machine in
422 basic_machine=ns32k-sequent 462 basic_machine=ns32k-sequent
423 os=-dynix 463 os=-dynix
424 ;; 464 ;;
465 blackfin)
466 basic_machine=bfin-unknown
467 os=-linux
468 ;;
469 blackfin-*)
470 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
471 os=-linux
472 ;;
473 bluegene*)
474 basic_machine=powerpc-ibm
475 os=-cnk
476 ;;
425 c90) 477 c90)
426 basic_machine=c90-cray 478 basic_machine=c90-cray
427 os=-unicos 479 os=-unicos
428 ;; 480 ;;
481 cegcc)
482 basic_machine=arm-unknown
483 os=-cegcc
484 ;;
429 convex-c1) 485 convex-c1)
430 basic_machine=c1-convex 486 basic_machine=c1-convex
431 os=-bsd 487 os=-bsd
@@ -454,8 +510,8 @@ case $basic_machine in
454 basic_machine=craynv-cray 510 basic_machine=craynv-cray
455 os=-unicosmp 511 os=-unicosmp
456 ;; 512 ;;
457 cr16c) 513 cr16)
458 basic_machine=cr16c-unknown 514 basic_machine=cr16-unknown
459 os=-elf 515 os=-elf
460 ;; 516 ;;
461 crds | unos) 517 crds | unos)
@@ -493,6 +549,10 @@ case $basic_machine in
493 basic_machine=m88k-motorola 549 basic_machine=m88k-motorola
494 os=-sysv3 550 os=-sysv3
495 ;; 551 ;;
552 dicos)
553 basic_machine=i686-pc
554 os=-dicos
555 ;;
496 djgpp) 556 djgpp)
497 basic_machine=i586-pc 557 basic_machine=i586-pc
498 os=-msdosdjgpp 558 os=-msdosdjgpp
@@ -647,6 +707,14 @@ case $basic_machine in
647 basic_machine=m68k-isi 707 basic_machine=m68k-isi
648 os=-sysv 708 os=-sysv
649 ;; 709 ;;
710 m68knommu)
711 basic_machine=m68k-unknown
712 os=-linux
713 ;;
714 m68knommu-*)
715 basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
716 os=-linux
717 ;;
650 m88k-omron*) 718 m88k-omron*)
651 basic_machine=m88k-omron 719 basic_machine=m88k-omron
652 ;; 720 ;;
@@ -662,6 +730,10 @@ case $basic_machine in
662 basic_machine=i386-pc 730 basic_machine=i386-pc
663 os=-mingw32 731 os=-mingw32
664 ;; 732 ;;
733 mingw32ce)
734 basic_machine=arm-unknown
735 os=-mingw32ce
736 ;;
665 miniframe) 737 miniframe)
666 basic_machine=m68000-convergent 738 basic_machine=m68000-convergent
667 ;; 739 ;;
@@ -687,6 +759,9 @@ case $basic_machine in
687 basic_machine=i386-pc 759 basic_machine=i386-pc
688 os=-msdos 760 os=-msdos
689 ;; 761 ;;
762 ms1-*)
763 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
764 ;;
690 mvs) 765 mvs)
691 basic_machine=i370-ibm 766 basic_machine=i370-ibm
692 os=-mvs 767 os=-mvs
@@ -762,9 +837,8 @@ case $basic_machine in
762 basic_machine=hppa1.1-oki 837 basic_machine=hppa1.1-oki
763 os=-proelf 838 os=-proelf
764 ;; 839 ;;
765 or32 | or32-*) 840 openrisc | openrisc-*)
766 basic_machine=or32-unknown 841 basic_machine=or32-unknown
767 os=-coff
768 ;; 842 ;;
769 os400) 843 os400)
770 basic_machine=powerpc-ibm 844 basic_machine=powerpc-ibm
@@ -786,6 +860,14 @@ case $basic_machine in
786 basic_machine=i860-intel 860 basic_machine=i860-intel
787 os=-osf 861 os=-osf
788 ;; 862 ;;
863 parisc)
864 basic_machine=hppa-unknown
865 os=-linux
866 ;;
867 parisc-*)
868 basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
869 os=-linux
870 ;;
789 pbd) 871 pbd)
790 basic_machine=sparc-tti 872 basic_machine=sparc-tti
791 ;; 873 ;;
@@ -795,6 +877,12 @@ case $basic_machine in
795 pc532 | pc532-*) 877 pc532 | pc532-*)
796 basic_machine=ns32k-pc532 878 basic_machine=ns32k-pc532
797 ;; 879 ;;
880 pc98)
881 basic_machine=i386-pc
882 ;;
883 pc98-*)
884 basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
885 ;;
798 pentium | p5 | k5 | k6 | nexgen | viac3) 886 pentium | p5 | k5 | k6 | nexgen | viac3)
799 basic_machine=i586-pc 887 basic_machine=i586-pc
800 ;; 888 ;;
@@ -851,6 +939,10 @@ case $basic_machine in
851 basic_machine=i586-unknown 939 basic_machine=i586-unknown
852 os=-pw32 940 os=-pw32
853 ;; 941 ;;
942 rdos)
943 basic_machine=i386-pc
944 os=-rdos
945 ;;
854 rom68k) 946 rom68k)
855 basic_machine=m68k-rom68k 947 basic_machine=m68k-rom68k
856 os=-coff 948 os=-coff
@@ -877,6 +969,10 @@ case $basic_machine in
877 sb1el) 969 sb1el)
878 basic_machine=mipsisa64sb1el-unknown 970 basic_machine=mipsisa64sb1el-unknown
879 ;; 971 ;;
972 sde)
973 basic_machine=mipsisa32-sde
974 os=-elf
975 ;;
880 sei) 976 sei)
881 basic_machine=mips-sei 977 basic_machine=mips-sei
882 os=-seiux 978 os=-seiux
@@ -888,6 +984,9 @@ case $basic_machine in
888 basic_machine=sh-hitachi 984 basic_machine=sh-hitachi
889 os=-hms 985 os=-hms
890 ;; 986 ;;
987 sh5el)
988 basic_machine=sh5le-unknown
989 ;;
891 sh64) 990 sh64)
892 basic_machine=sh64-unknown 991 basic_machine=sh64-unknown
893 ;; 992 ;;
@@ -977,6 +1076,10 @@ case $basic_machine in
977 basic_machine=tic6x-unknown 1076 basic_machine=tic6x-unknown
978 os=-coff 1077 os=-coff
979 ;; 1078 ;;
1079 tile*)
1080 basic_machine=tile-unknown
1081 os=-linux-gnu
1082 ;;
980 tx39) 1083 tx39)
981 basic_machine=mipstx39-unknown 1084 basic_machine=mipstx39-unknown
982 ;; 1085 ;;
@@ -1052,6 +1155,10 @@ case $basic_machine in
1052 basic_machine=z8k-unknown 1155 basic_machine=z8k-unknown
1053 os=-sim 1156 os=-sim
1054 ;; 1157 ;;
1158 z80-*-coff)
1159 basic_machine=z80-unknown
1160 os=-sim
1161 ;;
1055 none) 1162 none)
1056 basic_machine=none-none 1163 basic_machine=none-none
1057 os=-none 1164 os=-none
@@ -1090,13 +1197,10 @@ case $basic_machine in
1090 we32k) 1197 we32k)
1091 basic_machine=we32k-att 1198 basic_machine=we32k-att
1092 ;; 1199 ;;
1093 sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) 1200 sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
1094 basic_machine=sh-unknown 1201 basic_machine=sh-unknown
1095 ;; 1202 ;;
1096 sh64) 1203 sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
1097 basic_machine=sh64-unknown
1098 ;;
1099 sparc | sparcv8 | sparcv9 | sparcv9b)
1100 basic_machine=sparc-sun 1204 basic_machine=sparc-sun
1101 ;; 1205 ;;
1102 cydra) 1206 cydra)
@@ -1163,26 +1267,30 @@ case $os in
1163 # Each alternative MUST END IN A *, to match a version number. 1267 # Each alternative MUST END IN A *, to match a version number.
1164 # -sysv* is not here because it comes later, after sysvr4. 1268 # -sysv* is not here because it comes later, after sysvr4.
1165 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 1269 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
1166 | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ 1270 | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
1167 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ 1271 | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
1272 | -kopensolaris* \
1168 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 1273 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
1169 | -aos* \ 1274 | -aos* | -aros* \
1170 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 1275 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
1171 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 1276 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
1172 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ 1277 | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
1278 | -openbsd* | -solidbsd* \
1173 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 1279 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
1174 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 1280 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
1175 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 1281 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
1176 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 1282 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
1177 | -chorusos* | -chorusrdb* \ 1283 | -chorusos* | -chorusrdb* | -cegcc* \
1178 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 1284 | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
1179 | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ 1285 | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
1286 | -uxpv* | -beos* | -mpeix* | -udk* \
1180 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 1287 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
1181 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 1288 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
1182 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 1289 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
1183 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 1290 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
1184 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 1291 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
1185 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*) 1292 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
1293 | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
1186 # Remember, each alternative MUST END IN *, to match a version number. 1294 # Remember, each alternative MUST END IN *, to match a version number.
1187 ;; 1295 ;;
1188 -qnx*) 1296 -qnx*)
@@ -1200,7 +1308,7 @@ case $os in
1200 os=`echo $os | sed -e 's|nto|nto-qnx|'` 1308 os=`echo $os | sed -e 's|nto|nto-qnx|'`
1201 ;; 1309 ;;
1202 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ 1310 -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
1203 | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ 1311 | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
1204 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 1312 | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
1205 ;; 1313 ;;
1206 -mac*) 1314 -mac*)
@@ -1312,6 +1420,9 @@ case $os in
1312 -zvmoe) 1420 -zvmoe)
1313 os=-zvmoe 1421 os=-zvmoe
1314 ;; 1422 ;;
1423 -dicos*)
1424 os=-dicos
1425 ;;
1315 -none) 1426 -none)
1316 ;; 1427 ;;
1317 *) 1428 *)
@@ -1334,6 +1445,12 @@ else
1334# system, and we'll never get to this point. 1445# system, and we'll never get to this point.
1335 1446
1336case $basic_machine in 1447case $basic_machine in
1448 score-*)
1449 os=-elf
1450 ;;
1451 spu-*)
1452 os=-elf
1453 ;;
1337 *-acorn) 1454 *-acorn)
1338 os=-riscix1.2 1455 os=-riscix1.2
1339 ;; 1456 ;;
@@ -1343,9 +1460,9 @@ case $basic_machine in
1343 arm*-semi) 1460 arm*-semi)
1344 os=-aout 1461 os=-aout
1345 ;; 1462 ;;
1346 c4x-* | tic4x-*) 1463 c4x-* | tic4x-*)
1347 os=-coff 1464 os=-coff
1348 ;; 1465 ;;
1349 # This must come before the *-dec entry. 1466 # This must come before the *-dec entry.
1350 pdp10-*) 1467 pdp10-*)
1351 os=-tops20 1468 os=-tops20
@@ -1371,6 +1488,9 @@ case $basic_machine in
1371 m68*-cisco) 1488 m68*-cisco)
1372 os=-aout 1489 os=-aout
1373 ;; 1490 ;;
1491 mep-*)
1492 os=-elf
1493 ;;
1374 mips*-cisco) 1494 mips*-cisco)
1375 os=-elf 1495 os=-elf
1376 ;; 1496 ;;
@@ -1389,6 +1509,9 @@ case $basic_machine in
1389 *-be) 1509 *-be)
1390 os=-beos 1510 os=-beos
1391 ;; 1511 ;;
1512 *-haiku)
1513 os=-haiku
1514 ;;
1392 *-ibm) 1515 *-ibm)
1393 os=-aix 1516 os=-aix
1394 ;; 1517 ;;
@@ -1497,7 +1620,7 @@ case $basic_machine in
1497 -sunos*) 1620 -sunos*)
1498 vendor=sun 1621 vendor=sun
1499 ;; 1622 ;;
1500 -aix*) 1623 -cnk*|-aix*)
1501 vendor=ibm 1624 vendor=ibm
1502 ;; 1625 ;;
1503 -beos*) 1626 -beos*)
diff --git a/debian/changelog b/debian/changelog
index 47a6ae1a7..dbf1d40c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1openssh (1:5.1p1-7) UNRELEASED; urgency=low
2
3 * Update config.guess and config.sub from autotools-dev 20090611.1
4 (closes: #538301).
5
6 -- Colin Watson <cjwatson@debian.org> Fri, 24 Jul 2009 18:43:45 +0100
7
1openssh (1:5.1p1-6) unstable; urgency=low 8openssh (1:5.1p1-6) unstable; urgency=low
2 9
3 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather 10 * Open /proc/self/oom_adj with O_RDONLY or O_WRONLY as necessary, rather