2014-04-01 10:36:02 +00:00
|
|
|
From 26114ba365c1ef63d9605efc719f6c220ad624eb Mon Sep 17 00:00:00 2001
|
2013-12-30 20:40:09 +00:00
|
|
|
From: Xavier Leroy <xavier.leroy@inria.fr>
|
|
|
|
Date: Thu, 18 Jul 2013 16:07:25 +0000
|
2014-05-10 08:07:15 +00:00
|
|
|
Subject: [PATCH 09/14] Updated with latest versions from FSF.
|
2013-12-30 20:40:09 +00:00
|
|
|
|
|
|
|
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13907 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
|
|
|
|
(cherry picked from commit 24bb4caeb35e49126aa3a4c0101a412db1091213)
|
|
|
|
---
|
|
|
|
config/gnu/config.guess | 196 ++++++++++++++++++++++++++++--------------------
|
|
|
|
config/gnu/config.sub | 117 +++++++++++++++++------------
|
|
|
|
2 files changed, 183 insertions(+), 130 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/config/gnu/config.guess b/config/gnu/config.guess
|
|
|
|
index 8152efd..b79252d 100755
|
|
|
|
--- a/config/gnu/config.guess
|
|
|
|
+++ b/config/gnu/config.guess
|
|
|
|
@@ -1,14 +1,12 @@
|
|
|
|
#! /bin/sh
|
|
|
|
# Attempt to guess a canonical system name.
|
|
|
|
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
|
|
-# 2011 Free Software Foundation, Inc.
|
|
|
|
+# Copyright 1992-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
-timestamp='2011-11-11'
|
|
|
|
+timestamp='2013-06-10'
|
|
|
|
|
|
|
|
# This file is free software; you can redistribute it and/or modify it
|
|
|
|
# under the terms of the GNU General Public License as published by
|
|
|
|
-# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
+# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful, but
|
|
|
|
@@ -17,26 +15,22 @@ timestamp='2011-11-11'
|
|
|
|
# General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
-# along with this program; if not, write to the Free Software
|
|
|
|
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
-# 02110-1301, USA.
|
|
|
|
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
|
|
# distribute this file as part of a program that contains a
|
|
|
|
# configuration script generated by Autoconf, you may include it under
|
|
|
|
-# 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").
|
|
|
|
#
|
|
|
|
-# 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.
|
|
|
|
#
|
|
|
|
# You can get the latest version of this script from:
|
|
|
|
# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
|
|
|
|
+#
|
|
|
|
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
|
|
|
+
|
|
|
|
|
|
|
|
me=`echo "$0" | sed -e 's,.*/,,'`
|
|
|
|
|
|
|
|
@@ -56,9 +50,7 @@ version="\
|
|
|
|
GNU config.guess ($timestamp)
|
|
|
|
|
|
|
|
Originally written by Per Bothner.
|
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
|
|
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
|
|
|
|
-Software Foundation, Inc.
|
|
|
|
+Copyright 1992-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This is free software; see the source for copying conditions. There is NO
|
|
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
|
|
@@ -140,12 +132,33 @@ 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
|
|
|
|
|
|
|
|
+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
|
|
|
|
+
|
|
|
|
# Note: order is significant - the case branches are not exclusive.
|
|
|
|
|
|
|
|
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
|
|
*:NetBSD:*:*)
|
|
|
|
# NetBSD (nbsd) targets should (where applicable) match one or
|
|
|
|
- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
|
|
+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
|
|
|
|
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
|
|
|
|
# switched to ELF, *-*-netbsd* would select the old
|
|
|
|
# object file format. This provides both forward
|
|
|
|
@@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
|
|
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
|
|
|
|
echo "${machine}-${os}${release}"
|
|
|
|
exit ;;
|
|
|
|
+ *:Bitrig:*:*)
|
|
|
|
+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
|
|
|
|
+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
|
|
|
|
+ exit ;;
|
|
|
|
*:OpenBSD:*:*)
|
|
|
|
UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
|
|
|
|
echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
|
|
|
|
@@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
|
|
|
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
|
|
|
echo arm-acorn-riscix${UNAME_RELEASE}
|
|
|
|
exit ;;
|
|
|
|
- arm:riscos:*:*|arm:RISCOS:*:*)
|
|
|
|
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
|
|
|
|
echo arm-unknown-riscos
|
|
|
|
exit ;;
|
|
|
|
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
|
|
|
|
@@ -803,6 +820,9 @@ EOF
|
|
|
|
i*:CYGWIN*:*)
|
|
|
|
echo ${UNAME_MACHINE}-pc-cygwin
|
|
|
|
exit ;;
|
|
|
|
+ *:MINGW64*:*)
|
|
|
|
+ echo ${UNAME_MACHINE}-pc-mingw64
|
|
|
|
+ exit ;;
|
|
|
|
*:MINGW*:*)
|
|
|
|
echo ${UNAME_MACHINE}-pc-mingw32
|
|
|
|
exit ;;
|
|
|
|
@@ -854,15 +874,22 @@ EOF
|
|
|
|
exit ;;
|
|
|
|
*:GNU:*:*)
|
|
|
|
# the GNU system
|
|
|
|
- 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,/.*$,,'`
|
|
|
|
exit ;;
|
|
|
|
*:GNU/*:*:*)
|
|
|
|
# other systems with GNU libc and userland
|
|
|
|
- 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}
|
|
|
|
exit ;;
|
|
|
|
i*86:Minix:*:*)
|
|
|
|
echo ${UNAME_MACHINE}-pc-minix
|
|
|
|
exit ;;
|
|
|
|
+ aarch64:Linux:*:*)
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
|
+ exit ;;
|
|
|
|
+ aarch64_be:Linux:*:*)
|
|
|
|
+ UNAME_MACHINE=aarch64_be
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
|
+ exit ;;
|
|
|
|
alpha:Linux:*:*)
|
|
|
|
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
|
|
|
|
EV5) UNAME_MACHINE=alphaev5 ;;
|
|
|
|
@@ -874,59 +901,54 @@ 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 ;;
|
|
|
|
+ arc:Linux:*:* | arceb:Linux:*:*)
|
|
|
|
+ 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
|
|
|
|
then
|
|
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
|
|
|
else
|
|
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
exit ;;
|
|
|
|
avr32*:Linux:*:*)
|
|
|
|
- echo ${UNAME_MACHINE}-unknown-linux-gnu
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
|
exit ;;
|
|
|
|
cris:Linux:*:*)
|
|
|
|
- echo cris-axis-linux-gnu
|
|
|
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
|
|
|
exit ;;
|
|
|
|
crisv32:Linux:*:*)
|
|
|
|
- echo crisv32-axis-linux-gnu
|
|
|
|
+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
|
|
|
|
exit ;;
|
|
|
|
frv:Linux:*:*)
|
|
|
|
- echo frv-unknown-linux-gnu
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
|
exit ;;
|
|
|
|
hexagon:Linux:*:*)
|
|
|
|
- echo hexagon-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__
|
|
|
|
- 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}
|
|
|
|
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
|
|
|
|
@@ -945,54 +967,63 @@ 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; }
|
|
|
|
;;
|
|
|
|
+ or1k:Linux:*:*)
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
|
|
|
|
+ exit ;;
|
|
|
|
or32:Linux:*:*)
|
|
|
|
- echo or32-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 ;;
|
|
|
|
+ ppc64le:Linux:*:*)
|
|
|
|
+ echo powerpc64le-unknown-linux-${LIBC}
|
|
|
|
+ exit ;;
|
|
|
|
+ ppcle:Linux:*:*)
|
|
|
|
+ echo powerpcle-unknown-linux-${LIBC}
|
|
|
|
exit ;;
|
|
|
|
s390:Linux:*:* | s390x:Linux:*:*)
|
|
|
|
- echo ${UNAME_MACHINE}-ibm-linux
|
|
|
|
+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
|
|
|
|
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 x86_64-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.
|
|
|
|
@@ -1196,6 +1227,9 @@ EOF
|
|
|
|
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
|
|
|
|
echo i586-pc-haiku
|
|
|
|
exit ;;
|
|
|
|
+ x86_64:Haiku:*:*)
|
|
|
|
+ echo x86_64-unknown-haiku
|
|
|
|
+ exit ;;
|
|
|
|
SX-4:SUPER-UX:*:*)
|
|
|
|
echo sx4-nec-superux${UNAME_RELEASE}
|
|
|
|
exit ;;
|
|
|
|
@@ -1222,19 +1256,21 @@ EOF
|
|
|
|
exit ;;
|
|
|
|
*:Darwin:*:*)
|
|
|
|
UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
|
|
|
|
- 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
|
|
|
|
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
|
|
|
|
exit ;;
|
|
|
|
*:procnto*:*:* | *:QNX:[0123456789]*:*)
|
|
|
|
@@ -1251,7 +1287,7 @@ EOF
|
|
|
|
NEO-?:NONSTOP_KERNEL:*:*)
|
|
|
|
echo neo-tandem-nsk${UNAME_RELEASE}
|
|
|
|
exit ;;
|
|
|
|
- NSE-?:NONSTOP_KERNEL:*:*)
|
|
|
|
+ NSE-*:NONSTOP_KERNEL:*:*)
|
|
|
|
echo nse-tandem-nsk${UNAME_RELEASE}
|
|
|
|
exit ;;
|
|
|
|
NSR-?:NONSTOP_KERNEL:*:*)
|
|
|
|
@@ -1320,11 +1356,11 @@ EOF
|
|
|
|
i*86:AROS:*:*)
|
|
|
|
echo ${UNAME_MACHINE}-pc-aros
|
|
|
|
exit ;;
|
|
|
|
+ x86_64:VMkernel:*:*)
|
|
|
|
+ echo ${UNAME_MACHINE}-unknown-esx
|
|
|
|
+ exit ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
-#echo '(No uname command or uname output not recognized.)' 1>&2
|
|
|
|
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
|
|
|
|
-
|
|
|
|
eval $set_cc_for_build
|
|
|
|
cat >$dummy.c <<EOF
|
|
|
|
#ifdef _SEQUENT_
|
|
|
|
diff --git a/config/gnu/config.sub b/config/gnu/config.sub
|
|
|
|
index e76eaf4..8b612ab 100755
|
|
|
|
--- a/config/gnu/config.sub
|
|
|
|
+++ b/config/gnu/config.sub
|
|
|
|
@@ -1,38 +1,31 @@
|
|
|
|
#! /bin/sh
|
|
|
|
# Configuration validation subroutine script.
|
|
|
|
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
|
|
|
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
|
|
|
-# 2011 Free Software Foundation, Inc.
|
|
|
|
+# Copyright 1992-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
-timestamp='2011-11-11'
|
|
|
|
+timestamp='2013-04-24'
|
|
|
|
|
|
|
|
-# This file is (in principle) common to ALL GNU software.
|
|
|
|
-# The presence of a machine in this file suggests that SOME GNU software
|
|
|
|
-# can handle that machine. It does not imply ALL GNU software can.
|
|
|
|
-#
|
|
|
|
-# This file is free software; you can redistribute it and/or modify
|
|
|
|
-# it under the terms of the GNU General Public License as published by
|
|
|
|
-# the Free Software Foundation; either version 2 of the License, or
|
|
|
|
+# This file is free software; you can redistribute it and/or modify it
|
|
|
|
+# under the terms of the GNU General Public License as published by
|
|
|
|
+# the Free Software Foundation; either version 3 of the License, or
|
|
|
|
# (at your option) any later version.
|
|
|
|
#
|
|
|
|
-# This program is distributed in the hope that it will be useful,
|
|
|
|
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
-# GNU General Public License for more details.
|
|
|
|
+# This program is distributed in the hope that it will be useful, but
|
|
|
|
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
+# General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
-# along with this program; if not, write to the Free Software
|
|
|
|
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
-# 02110-1301, USA.
|
|
|
|
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
#
|
|
|
|
# As a special exception to the GNU General Public License, if you
|
|
|
|
# distribute this file as part of a program that contains a
|
|
|
|
# configuration script generated by Autoconf, you may include it under
|
|
|
|
-# the same distribution terms that you use for the rest of that program.
|
|
|
|
+# 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").
|
|
|
|
|
|
|
|
|
|
|
|
-# Please send patches to <config-patches@gnu.org>. Submit a context
|
|
|
|
-# diff and a properly formatted GNU ChangeLog entry.
|
|
|
|
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
|
|
|
|
#
|
|
|
|
# Configuration subroutine to validate and canonicalize a configuration type.
|
|
|
|
# Supply the specified configuration type as an argument.
|
|
|
|
@@ -75,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
|
|
|
|
version="\
|
|
|
|
GNU config.sub ($timestamp)
|
|
|
|
|
|
|
|
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
|
|
|
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
|
|
|
|
-Software Foundation, Inc.
|
|
|
|
+Copyright 1992-2013 Free Software Foundation, Inc.
|
|
|
|
|
|
|
|
This is free software; see the source for copying conditions. There is NO
|
|
|
|
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
|
|
@@ -125,13 +116,17 @@ esac
|
|
|
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
|
|
|
case $maybe_os in
|
|
|
|
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
|
|
|
|
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
|
|
+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
|
|
|
|
knetbsd*-gnu* | netbsd*-gnu* | \
|
|
|
|
kopensolaris*-gnu* | \
|
|
|
|
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
|
|
os=-$maybe_os
|
|
|
|
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
|
|
|
;;
|
|
|
|
+ android-linux)
|
|
|
|
+ os=-linux-android
|
|
|
|
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
|
|
|
|
+ ;;
|
|
|
|
*)
|
|
|
|
basic_machine=`echo $1 | sed 's/-[^-]*$//'`
|
|
|
|
if [ $basic_machine != $1 ]
|
|
|
|
@@ -154,7 +149,7 @@ case $os in
|
|
|
|
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
|
|
|
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
|
|
|
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
|
|
|
- -apple | -axis | -knuth | -cray | -microblaze)
|
|
|
|
+ -apple | -axis | -knuth | -cray | -microblaze*)
|
|
|
|
os=
|
|
|
|
basic_machine=$1
|
|
|
|
;;
|
|
|
|
@@ -223,6 +218,12 @@ case $os in
|
|
|
|
-isc*)
|
|
|
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
|
|
;;
|
|
|
|
+ -lynx*178)
|
|
|
|
+ os=-lynxos178
|
|
|
|
+ ;;
|
|
|
|
+ -lynx*5)
|
|
|
|
+ os=-lynxos5
|
|
|
|
+ ;;
|
|
|
|
-lynx*)
|
|
|
|
os=-lynxos
|
|
|
|
;;
|
|
|
|
@@ -247,11 +248,14 @@ case $basic_machine in
|
|
|
|
# Some are omitted here because they have special meanings below.
|
|
|
|
1750a | 580 \
|
|
|
|
| a29k \
|
|
|
|
+ | aarch64 | aarch64_be \
|
|
|
|
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
|
|
|
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
|
|
|
| am33_2.0 \
|
|
|
|
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
|
|
|
- | be32 | be64 \
|
|
|
|
+ | arc | arceb \
|
|
|
|
+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
|
|
|
+ | avr | avr32 \
|
|
|
|
+ | be32 | be64 \
|
|
|
|
| bfin \
|
|
|
|
| c4x | clipper \
|
|
|
|
| d10v | d30v | dlx | dsp16xx \
|
|
|
|
@@ -264,7 +268,7 @@ case $basic_machine in
|
|
|
|
| le32 | le64 \
|
|
|
|
| lm32 \
|
|
|
|
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
|
|
|
- | maxq | mb | microblaze | mcore | mep | metag \
|
|
|
|
+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \
|
|
|
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
|
|
|
| mips16 \
|
|
|
|
| mips64 | mips64el \
|
|
|
|
@@ -282,16 +286,17 @@ case $basic_machine in
|
|
|
|
| mipsisa64r2 | mipsisa64r2el \
|
|
|
|
| mipsisa64sb1 | mipsisa64sb1el \
|
|
|
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
|
|
|
+ | mipsr5900 | mipsr5900el \
|
|
|
|
| mipstx39 | mipstx39el \
|
|
|
|
| mn10200 | mn10300 \
|
|
|
|
| moxie \
|
|
|
|
| mt \
|
|
|
|
| msp430 \
|
|
|
|
| nds32 | nds32le | nds32be \
|
|
|
|
- | nios | nios2 \
|
|
|
|
+ | nios | nios2 | nios2eb | nios2el \
|
|
|
|
| ns16k | ns32k \
|
|
|
|
| open8 \
|
|
|
|
- | or32 \
|
|
|
|
+ | or1k | or32 \
|
|
|
|
| pdp10 | pdp11 | pj | pjl \
|
|
|
|
| powerpc | powerpc64 | powerpc64le | powerpcle \
|
|
|
|
| pyramid \
|
|
|
|
@@ -319,8 +324,7 @@ case $basic_machine in
|
|
|
|
c6x)
|
|
|
|
basic_machine=tic6x-unknown
|
|
|
|
;;
|
|
|
|
- m6811 | m68hc11 | m6812 | m68hc12 | picochip)
|
|
|
|
- # Motorola 68HC11/12.
|
|
|
|
+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
|
|
|
|
basic_machine=$basic_machine-unknown
|
|
|
|
os=-none
|
|
|
|
;;
|
|
|
|
@@ -333,7 +337,10 @@ case $basic_machine in
|
|
|
|
strongarm | thumb | xscale)
|
|
|
|
basic_machine=arm-unknown
|
|
|
|
;;
|
|
|
|
-
|
|
|
|
+ xgate)
|
|
|
|
+ basic_machine=$basic_machine-unknown
|
|
|
|
+ os=-none
|
|
|
|
+ ;;
|
|
|
|
xscaleeb)
|
|
|
|
basic_machine=armeb-unknown
|
|
|
|
;;
|
|
|
|
@@ -356,9 +363,10 @@ case $basic_machine in
|
|
|
|
# Recognize the basic CPU types with company name.
|
|
|
|
580-* \
|
|
|
|
| a29k-* \
|
|
|
|
+ | aarch64-* | aarch64_be-* \
|
|
|
|
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
|
|
|
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
|
|
|
- | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
|
|
|
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
|
|
|
|
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
|
|
|
| avr-* | avr32-* \
|
|
|
|
| be32-* | be64-* \
|
|
|
|
@@ -377,7 +385,8 @@ case $basic_machine in
|
|
|
|
| lm32-* \
|
|
|
|
| m32c-* | m32r-* | m32rle-* \
|
|
|
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
|
|
|
- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
|
|
|
|
+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
|
|
|
|
+ | microblaze-* | microblazeel-* \
|
|
|
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
|
|
|
| mips16-* \
|
|
|
|
| mips64-* | mips64el-* \
|
|
|
|
@@ -395,12 +404,13 @@ case $basic_machine in
|
|
|
|
| mipsisa64r2-* | mipsisa64r2el-* \
|
|
|
|
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
|
|
|
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
|
|
|
+ | mipsr5900-* | mipsr5900el-* \
|
|
|
|
| mipstx39-* | mipstx39el-* \
|
|
|
|
| mmix-* \
|
|
|
|
| mt-* \
|
|
|
|
| msp430-* \
|
|
|
|
| nds32-* | nds32le-* | nds32be-* \
|
|
|
|
- | nios-* | nios2-* \
|
|
|
|
+ | nios-* | nios2-* | nios2eb-* | nios2el-* \
|
|
|
|
| none-* | np1-* | ns16k-* | ns32k-* \
|
|
|
|
| open8-* \
|
|
|
|
| orion-* \
|
|
|
|
@@ -719,7 +729,6 @@ case $basic_machine in
|
|
|
|
i370-ibm* | ibm*)
|
|
|
|
basic_machine=i370-ibm
|
|
|
|
;;
|
|
|
|
-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
|
|
|
|
i*86v32)
|
|
|
|
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
|
|
|
|
os=-sysv32
|
|
|
|
@@ -777,9 +786,13 @@ case $basic_machine in
|
|
|
|
basic_machine=ns32k-utek
|
|
|
|
os=-sysv
|
|
|
|
;;
|
|
|
|
- microblaze)
|
|
|
|
+ microblaze*)
|
|
|
|
basic_machine=microblaze-xilinx
|
|
|
|
;;
|
|
|
|
+ mingw64)
|
|
|
|
+ basic_machine=x86_64-pc
|
|
|
|
+ os=-mingw64
|
|
|
|
+ ;;
|
|
|
|
mingw32)
|
|
|
|
basic_machine=i386-pc
|
|
|
|
os=-mingw32
|
|
|
|
@@ -1008,7 +1021,11 @@ case $basic_machine in
|
|
|
|
basic_machine=i586-unknown
|
|
|
|
os=-pw32
|
|
|
|
;;
|
|
|
|
- rdos)
|
|
|
|
+ rdos | rdos64)
|
|
|
|
+ basic_machine=x86_64-pc
|
|
|
|
+ os=-rdos
|
|
|
|
+ ;;
|
|
|
|
+ rdos32)
|
|
|
|
basic_machine=i386-pc
|
|
|
|
os=-rdos
|
|
|
|
;;
|
|
|
|
@@ -1335,21 +1352,21 @@ case $os in
|
|
|
|
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
|
|
|
|
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
|
|
|
|
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
|
|
|
|
- | -sym* | -kopensolaris* \
|
|
|
|
+ | -sym* | -kopensolaris* | -plan9* \
|
|
|
|
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
|
|
|
|
| -aos* | -aros* \
|
|
|
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
|
|
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
|
|
|
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
|
|
|
- | -openbsd* | -solidbsd* \
|
|
|
|
+ | -bitrig* | -openbsd* | -solidbsd* \
|
|
|
|
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
|
|
|
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
|
|
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
|
|
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
|
|
|
| -chorusos* | -chorusrdb* | -cegcc* \
|
|
|
|
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
|
|
|
- | -mingw32* | -linux-gnu* | -linux-android* \
|
|
|
|
- | -linux-newlib* | -linux-uclibc* \
|
|
|
|
+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
|
|
|
|
+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \
|
|
|
|
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
|
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
|
|
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
|
|
|
@@ -1481,9 +1498,6 @@ case $os in
|
|
|
|
-aros*)
|
|
|
|
os=-aros
|
|
|
|
;;
|
|
|
|
- -kaos*)
|
|
|
|
- os=-kaos
|
|
|
|
- ;;
|
|
|
|
-zvmoe)
|
|
|
|
os=-zvmoe
|
|
|
|
;;
|
|
|
|
@@ -1532,6 +1546,9 @@ case $basic_machine in
|
|
|
|
c4x-* | tic4x-*)
|
|
|
|
os=-coff
|
|
|
|
;;
|
|
|
|
+ hexagon-*)
|
|
|
|
+ os=-elf
|
|
|
|
+ ;;
|
|
|
|
tic54x-*)
|
|
|
|
os=-coff
|
|
|
|
;;
|
|
|
|
@@ -1559,9 +1576,6 @@ case $basic_machine in
|
|
|
|
;;
|
|
|
|
m68000-sun)
|
|
|
|
os=-sunos3
|
|
|
|
- # This also exists in the configure program, but was not the
|
|
|
|
- # default.
|
|
|
|
- # os=-sunos4
|
|
|
|
;;
|
|
|
|
m68*-cisco)
|
|
|
|
os=-aout
|
|
|
|
@@ -1575,6 +1589,9 @@ case $basic_machine in
|
|
|
|
mips*-*)
|
|
|
|
os=-elf
|
|
|
|
;;
|
|
|
|
+ or1k-*)
|
|
|
|
+ os=-elf
|
|
|
|
+ ;;
|
|
|
|
or32-*)
|
|
|
|
os=-coff
|
|
|
|
;;
|
|
|
|
--
|
2014-05-10 08:07:15 +00:00
|
|
|
1.9.0
|
2013-12-30 20:40:09 +00:00
|
|
|
|