Deleted Added
full compact
3,5c3
< # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
< # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
< # 2011, 2012 Free Software Foundation, Inc.
---
> # Copyright 1992-2013 Free Software Foundation, Inc.
7c5
< timestamp='2012-06-10'
---
> timestamp='2013-06-10'
11c9
< # the Free Software Foundation; either version 2 of the License, or
---
> # the Free Software Foundation; either version 3 of the License, or
25,30c23,25
< # the same distribution terms that you use for the rest of that program.
<
<
< # Originally written by Per Bothner. Please send patches (context
< # diff format) to <config-patches@gnu.org> and include a ChangeLog
< # entry.
---
> # the same distribution terms that you use for the rest of that
> # program. This Exception is an additional permission under section 7
> # of the GNU General Public License, version 3 ("GPLv3").
32,34c27
< # 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.
---
> # Originally written by Per Bothner.
37a31,32
> #
> # Please send patches with a ChangeLog entry to config-patches@gnu.org.
38a34
>
57,59c53
< Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
< 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
< Free Software Foundation, Inc.
---
> Copyright 1992-2013 Free Software Foundation, Inc.
140a135,155
> case "${UNAME_SYSTEM}" in
> Linux|GNU|GNU/*)
> # If the system lacks a compiler, then just pick glibc.
> # We could probably try harder.
> LIBC=gnu
>
> eval $set_cc_for_build
> cat <<-EOF > $dummy.c
> #include <features.h>
> #if defined(__UCLIBC__)
> LIBC=uclibc
> #elif defined(__dietlibc__)
> LIBC=dietlibc
> #else
> LIBC=gnu
> #endif
> EOF
> eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
> ;;
> esac
>
202a218,221
> *:Bitrig:*:*)
> UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
> echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
> exit ;;
305c324
< arm:riscos:*:*|arm:RISCOS:*:*)
---
> arm*:riscos:*:*|arm*:RISCOS:*:*)
803a823,825
> *:MINGW64*:*)
> echo ${UNAME_MACHINE}-pc-mingw64
> exit ;;
855c877
< echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
---
> echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
859c881
< echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
---
> echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
865c887
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
869c891
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
882,883c904,905
< if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
< echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
---
> if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
884a907,909
> arc:Linux:*:* | arceb:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
890c915
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
895c920
< echo ${UNAME_MACHINE}-unknown-linux-gnueabi
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
897c922
< echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
902c927
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
905c930
< echo ${UNAME_MACHINE}-axis-linux-gnu
---
> echo ${UNAME_MACHINE}-axis-linux-${LIBC}
908c933
< echo ${UNAME_MACHINE}-axis-linux-gnu
---
> echo ${UNAME_MACHINE}-axis-linux-${LIBC}
911c936
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
914c939
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
917,925c942
< LIBC=gnu
< eval $set_cc_for_build
< sed 's/^ //' << EOF >$dummy.c
< #ifdef __dietlibc__
< LIBC=dietlibc
< #endif
< EOF
< eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
< echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
---
> echo ${UNAME_MACHINE}-pc-linux-${LIBC}
928c945
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
931c948
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
934c951
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
953c970
< test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
---
> test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
954a972,974
> or1k:Linux:*:*)
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
> exit ;;
956c976
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
959c979
< echo sparc-unknown-linux-gnu
---
> echo sparc-unknown-linux-${LIBC}
962c982
< echo hppa64-unknown-linux-gnu
---
> echo hppa64-unknown-linux-${LIBC}
967,969c987,989
< PA7*) echo hppa1.1-unknown-linux-gnu ;;
< PA8*) echo hppa2.0-unknown-linux-gnu ;;
< *) echo hppa-unknown-linux-gnu ;;
---
> PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
> PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
> *) echo hppa-unknown-linux-${LIBC} ;;
973c993
< echo powerpc64-unknown-linux-gnu
---
> echo powerpc64-unknown-linux-${LIBC}
976c996
< echo powerpc-unknown-linux-gnu
---
> echo powerpc-unknown-linux-${LIBC}
977a998,1003
> ppc64le:Linux:*:*)
> echo powerpc64le-unknown-linux-${LIBC}
> exit ;;
> ppcle:Linux:*:*)
> echo powerpcle-unknown-linux-${LIBC}
> exit ;;
979c1005
< echo ${UNAME_MACHINE}-ibm-linux
---
> echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
982c1008
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
985c1011
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
988c1014
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
991c1017
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
994c1020
< echo ${UNAME_MACHINE}-dec-linux-gnu
---
> echo ${UNAME_MACHINE}-dec-linux-${LIBC}
997c1023
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1000c1026
< echo ${UNAME_MACHINE}-unknown-linux-gnu
---
> echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
1203a1230,1232
> x86_64:Haiku:*:*)
> echo x86_64-unknown-haiku
> exit ;;
1230,1242c1259,1273
< case $UNAME_PROCESSOR in
< i386)
< eval $set_cc_for_build
< if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
< if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
< (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
< grep IS_64BIT_ARCH >/dev/null
< then
< UNAME_PROCESSOR="x86_64"
< fi
< fi ;;
< unknown) UNAME_PROCESSOR=powerpc ;;
< esac
---
> eval $set_cc_for_build
> if test "$UNAME_PROCESSOR" = unknown ; then
> UNAME_PROCESSOR=powerpc
> fi
> if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
> if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
> (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
> grep IS_64BIT_ARCH >/dev/null
> then
> case $UNAME_PROCESSOR in
> i386) UNAME_PROCESSOR=x86_64 ;;
> powerpc) UNAME_PROCESSOR=powerpc64 ;;
> esac
> fi
> fi
1333,1335d1363
< #echo '(No uname command or uname output not recognized.)' 1>&2
< #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
<