171 lines
5.3 KiB
Diff
171 lines
5.3 KiB
Diff
Upstream-Status: Pending
|
|
|
|
Patch courtesy gentoo-portage/sys-devel/gnuconfig/files/automake-1.8.5-config-guess-uclibc.patch.
|
|
|
|
updated to 20050516 by Marcin 'Hrw' Juszkiewicz (by hand)
|
|
updated to 20080123 by Nitin A Kamble (by hand)
|
|
updated to 20111001 by Saul Wold (by hand)
|
|
updated to 20120818 by Marcin 'Hrw' Juszkiewicz (by hand)
|
|
|
|
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
|
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
|
|
|
|
---
|
|
config.guess | 67 +++++++++++++++++++++++++++++++++++------------------------
|
|
1 file changed, 40 insertions(+), 27 deletions(-)
|
|
|
|
--- git.orig/config.guess
|
|
+++ git/config.guess
|
|
@@ -138,6 +138,19 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
|
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
|
|
|
+# Detect uclibc systems.
|
|
+
|
|
+LIBC="gnu"
|
|
+if [ -f /usr/include/bits/uClibc_config.h ]
|
|
+then
|
|
+ LIBC=uclibc
|
|
+ if [ -n `grep "#define __UCLIBC_CONFIG_VERSION__" /usr/include/bits/uClibc_config.h` ]
|
|
+ then
|
|
+ UCLIBC_SUBVER=`sed -n "/#define __UCLIBC_CONFIG_VERSION__ /s///p" /usr/include/bits/uClibc_config.h`
|
|
+ LIBC=$LIBC$UCLIBC_SUBVER
|
|
+ fi
|
|
+fi
|
|
+
|
|
# Note: order is significant - the case branches are not exclusive.
|
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
@@ -886,15 +899,15 @@ EOF
|
|
EV68*) UNAME_MACHINE=alphaev68 ;;
|
|
esac
|
|
objdump --private-headers /bin/sh | grep -q ld.so.1
|
|
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
+ if test "$?" = 0 ; then LIBC="gnulibc1" ; else LIBC="" ; fi
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
arm*:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
| grep -q __ARM_EABI__
|
|
then
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
else
|
|
if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
|
|
| grep -q __ARM_PCS_VFP
|
|
@@ -906,19 +919,19 @@ EOF
|
|
fi
|
|
exit ;;
|
|
avr32*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
cris:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
|
exit ;;
|
|
crisv32:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-axis-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
|
exit ;;
|
|
frv:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
hexagon:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
i*86:Linux:*:*)
|
|
LIBC=gnu
|
|
@@ -932,13 +945,13 @@ EOF
|
|
echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
exit ;;
|
|
ia64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
m32r*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
m68*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
mips:Linux:*:* | mips64:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
@@ -957,54 +970,54 @@ EOF
|
|
#endif
|
|
EOF
|
|
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
|
|
;;
|
|
or32:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
padre:Linux:*:*)
|
|
- echo sparc-unknown-linux-gnu
|
|
+ echo sparc-unknown-linux-${LIBC}
|
|
exit ;;
|
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
- echo hppa64-unknown-linux-gnu
|
|
+ echo hppa64-unknown-linux-${LIBC}
|
|
exit ;;
|
|
parisc:Linux:*:* | hppa:Linux:*:*)
|
|
# Look for CPU level
|
|
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/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 ;;
|
|
+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
|
|
+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
|
|
+ *) echo hppa-unknown-linux-${LIBC} ;;
|
|
esac
|
|
exit ;;
|
|
ppc64:Linux:*:*)
|
|
- echo powerpc64-unknown-linux-gnu
|
|
+ echo powerpc64-unknown-linux-${LIBC}
|
|
exit ;;
|
|
ppc:Linux:*:*)
|
|
- echo powerpc-unknown-linux-gnu
|
|
+ echo powerpc-unknown-linux-${LIBC}
|
|
exit ;;
|
|
s390:Linux:*:* | s390x:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-ibm-linux
|
|
exit ;;
|
|
sh64*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
sh*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
tile*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
vax:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
|
|
exit ;;
|
|
x86_64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
xtensa*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
i*86:DYNIX/ptx:4*:*)
|
|
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
|