185 lines
5.5 KiB
Diff
185 lines
5.5 KiB
Diff
From eee83aa62993b15b7f460cca9583cd69a15b5357 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
Date: Thu, 15 Nov 2012 17:01:13 +0100
|
|
Subject: [PATCH 1/2] config: add support for uClibc
|
|
|
|
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|
---
|
|
config.guess | 70 ++++++++++++++++++++++++++++++++++++----------------------
|
|
1 file changed, 43 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/config.guess b/config.guess
|
|
index 872b96a..9509179 100755
|
|
--- a/config.guess
|
|
+++ b/config.guess
|
|
@@ -138,6 +138,23 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
|
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
|
|
|
+if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
|
|
+ eval $set_cc_for_build
|
|
+ cat << EOF > $dummy.c
|
|
+ #include <features.h>
|
|
+ #ifdef __UCLIBC__
|
|
+ # ifdef __UCLIBC_CONFIG_VERSION__
|
|
+ LIBC=uclibc __UCLIBC_CONFIG_VERSION__
|
|
+ # else
|
|
+ LIBC=uclibc
|
|
+ # endif
|
|
+ #else
|
|
+ LIBC=gnu
|
|
+ #endif
|
|
+EOF
|
|
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
|
|
+fi
|
|
+
|
|
# Note: order is significant - the case branches are not exclusive.
|
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
@@ -869,11 +886,11 @@ EOF
|
|
echo ${UNAME_MACHINE}-pc-minix
|
|
exit ;;
|
|
aarch64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
aarch64_be:Linux:*:*)
|
|
UNAME_MACHINE=aarch64_be
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
exit ;;
|
|
alpha:Linux:*:*)
|
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
@@ -886,15 +903,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" ; 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,22 +923,21 @@ 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
|
|
eval $set_cc_for_build
|
|
sed 's/^ //' << EOF >$dummy.c
|
|
#ifdef __dietlibc__
|
|
@@ -932,13 +948,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,10 +973,10 @@ 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
|
|
@@ -971,40 +987,40 @@ EOF
|
|
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
|
|
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.
|
|
--
|
|
1.7.9.5
|
|
|