forked from pool/automake
158 lines
4.5 KiB
Diff
158 lines
4.5 KiB
Diff
--- lib/config.guess
|
|
+++ lib/config.guess
|
|
@@ -139,6 +139,16 @@
|
|
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
|
|
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
|
|
|
|
+case "${UNAME_MACHINE}" in
|
|
+ i?86)
|
|
+ test -z "$VENDOR" && VENDOR=pc
|
|
+ ;;
|
|
+ *)
|
|
+ test -z "$VENDOR" && VENDOR=unknown
|
|
+ ;;
|
|
+esac
|
|
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
|
|
+
|
|
# Note: order is significant - the case branches are not exclusive.
|
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
@@ -829,7 +839,7 @@
|
|
echo ${UNAME_MACHINE}-pc-minix
|
|
exit ;;
|
|
arm*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
cris:Linux:*:*)
|
|
echo cris-axis-linux-gnu
|
|
@@ -838,16 +848,16 @@
|
|
echo crisv32-axis-linux-gnu
|
|
exit ;;
|
|
frv:Linux:*:*)
|
|
- echo frv-unknown-linux-gnu
|
|
+ echo frv-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ia64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
m32r*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
m68*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
mips:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
@@ -870,7 +880,7 @@
|
|
s: ::g
|
|
p
|
|
}'`"
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
;;
|
|
mips64:Linux:*:*)
|
|
eval $set_cc_for_build
|
|
@@ -893,16 +903,16 @@
|
|
s: ::g
|
|
p
|
|
}'`"
|
|
- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
|
|
+ test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
|
|
;;
|
|
or32:Linux:*:*)
|
|
- echo or32-unknown-linux-gnu
|
|
+ echo or32-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ppc:Linux:*:*)
|
|
- echo powerpc-unknown-linux-gnu
|
|
+ echo powerpc-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
ppc64:Linux:*:*)
|
|
- echo powerpc64-unknown-linux-gnu
|
|
+ echo powerpc64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
alpha:Linux:*:*)
|
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
@@ -916,36 +926,36 @@
|
|
esac
|
|
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
|
|
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${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-${VENDOR}-linux-gnu ;;
|
|
+ PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
|
|
+ *) echo hppa-${VENDOR}-linux-gnu ;;
|
|
esac
|
|
exit ;;
|
|
parisc64:Linux:*:* | hppa64:Linux:*:*)
|
|
- echo hppa64-unknown-linux-gnu
|
|
+ echo hppa64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
s390:Linux:*:* | s390x:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-ibm-linux
|
|
exit ;;
|
|
sh64*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
sh*:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
sparc:Linux:*:* | sparc64:Linux:*:*)
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
+ echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
vax:Linux:*:*)
|
|
echo ${UNAME_MACHINE}-dec-linux-gnu
|
|
exit ;;
|
|
x86_64:Linux:*:*)
|
|
- echo x86_64-unknown-linux-gnu
|
|
+ echo x86_64-${VENDOR}-linux-gnu
|
|
exit ;;
|
|
i*86:Linux:*:*)
|
|
# The BFD linker knows what the default object file format is, so
|
|
@@ -960,18 +970,18 @@
|
|
p'`
|
|
case "$ld_supported_targets" in
|
|
elf32-i386)
|
|
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
|
|
+ TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux-gnu"
|
|
;;
|
|
a.out-i386-linux)
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuaout"
|
|
exit ;;
|
|
coff-i386)
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnucoff"
|
|
exit ;;
|
|
"")
|
|
# Either a pre-BFD a.out linker (linux-gnuoldld) or
|
|
# one that does not give us useful --help.
|
|
- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-gnuoldld"
|
|
exit ;;
|
|
esac
|
|
# Determine whether the default compiler is a.out or elf
|
|
@@ -1005,7 +1015,7 @@
|
|
p
|
|
}'`"
|
|
test x"${LIBC}" != x && {
|
|
- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
|
|
+ echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
|
|
exit
|
|
}
|
|
test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
|