| Index: third_party/freetype2/src/builds/unix/config.guess
|
| diff --git a/third_party/libxml/src/config.guess b/third_party/freetype2/src/builds/unix/config.guess
|
| similarity index 83%
|
| copy from third_party/libxml/src/config.guess
|
| copy to third_party/freetype2/src/builds/unix/config.guess
|
| index dc84c68ef798c6a5000c78c6dd7380d34c9e0218..b79252d6b1034cbcce18ed21d4ed21a405f987e9 100755
|
| --- a/third_party/libxml/src/config.guess
|
| +++ b/third_party/freetype2/src/builds/unix/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
|
| -# Free Software Foundation, Inc.
|
| +# Copyright 1992-2013 Free Software Foundation, Inc.
|
|
|
| -timestamp='2009-11-20'
|
| +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='2009-11-20'
|
| # 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,8 +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 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."
|
| @@ -139,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
|
| @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
| fi
|
| ;;
|
| *)
|
| - os=netbsd
|
| + os=netbsd
|
| ;;
|
| esac
|
| # The OS release
|
| @@ -201,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}
|
| @@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
| UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
|
| ;;
|
| *5.*)
|
| - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
|
| + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
|
| ;;
|
| esac
|
| # According to Compaq, /usr/sbin/psrinfo has been available on
|
| @@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
| # A Xn.n version is an unreleased experimental baselevel.
|
| # 1.2 uses "1.2" for uname -r.
|
| echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
| - exit ;;
|
| + # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
|
| + exitcode=$?
|
| + trap '' 0
|
| + exit $exitcode ;;
|
| Alpha\ *:Windows_NT*:*)
|
| # How do we know it's Interix rather than the generic POSIX subsystem?
|
| # Should we change UNAME_MACHINE based on the output of uname instead
|
| @@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
| echo s390-ibm-zvmoe
|
| exit ;;
|
| *:OS400:*:*)
|
| - echo powerpc-ibm-os400
|
| + echo powerpc-ibm-os400
|
| exit ;;
|
| 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:*:*)
|
| @@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
| # MiNT. But MiNT is downward compatible to TOS, so this should
|
| # be no problem.
|
| atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
|
| - echo m68k-atari-mint${UNAME_RELEASE}
|
| + echo m68k-atari-mint${UNAME_RELEASE}
|
| exit ;;
|
| atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
|
| echo m68k-atari-mint${UNAME_RELEASE}
|
| - exit ;;
|
| + exit ;;
|
| *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
|
| - echo m68k-atari-mint${UNAME_RELEASE}
|
| + echo m68k-atari-mint${UNAME_RELEASE}
|
| exit ;;
|
| milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
|
| - echo m68k-milan-mint${UNAME_RELEASE}
|
| - exit ;;
|
| + echo m68k-milan-mint${UNAME_RELEASE}
|
| + exit ;;
|
| hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
|
| - echo m68k-hades-mint${UNAME_RELEASE}
|
| - exit ;;
|
| + echo m68k-hades-mint${UNAME_RELEASE}
|
| + exit ;;
|
| *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
|
| - echo m68k-unknown-mint${UNAME_RELEASE}
|
| - exit ;;
|
| + echo m68k-unknown-mint${UNAME_RELEASE}
|
| + exit ;;
|
| m68k:machten:*:*)
|
| echo m68k-apple-machten${UNAME_RELEASE}
|
| exit ;;
|
| @@ -480,8 +501,8 @@ EOF
|
| echo m88k-motorola-sysv3
|
| exit ;;
|
| AViiON:dgux:*:*)
|
| - # DG/UX returns AViiON for all architectures
|
| - UNAME_PROCESSOR=`/usr/bin/uname -p`
|
| + # DG/UX returns AViiON for all architectures
|
| + UNAME_PROCESSOR=`/usr/bin/uname -p`
|
| if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
|
| then
|
| if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
|
| @@ -494,7 +515,7 @@ EOF
|
| else
|
| echo i586-dg-dgux${UNAME_RELEASE}
|
| fi
|
| - exit ;;
|
| + exit ;;
|
| M88*:DolphinOS:*:*) # DolphinOS (SVR3)
|
| echo m88k-dolphin-sysv3
|
| exit ;;
|
| @@ -551,7 +572,7 @@ EOF
|
| echo rs6000-ibm-aix3.2
|
| fi
|
| exit ;;
|
| - *:AIX:*:[456])
|
| + *:AIX:*:[4567])
|
| IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
|
| if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
| IBM_ARCH=rs6000
|
| @@ -594,52 +615,52 @@ EOF
|
| 9000/[678][0-9][0-9])
|
| if [ -x /usr/bin/getconf ]; then
|
| sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
|
| - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
|
| - case "${sc_cpu_version}" in
|
| - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
|
| - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
|
| - 532) # CPU_PA_RISC2_0
|
| - case "${sc_kernel_bits}" in
|
| - 32) HP_ARCH="hppa2.0n" ;;
|
| - 64) HP_ARCH="hppa2.0w" ;;
|
| + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
|
| + case "${sc_cpu_version}" in
|
| + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
|
| + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
|
| + 532) # CPU_PA_RISC2_0
|
| + case "${sc_kernel_bits}" in
|
| + 32) HP_ARCH="hppa2.0n" ;;
|
| + 64) HP_ARCH="hppa2.0w" ;;
|
| '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
|
| - esac ;;
|
| - esac
|
| + esac ;;
|
| + esac
|
| fi
|
| if [ "${HP_ARCH}" = "" ]; then
|
| eval $set_cc_for_build
|
| - sed 's/^ //' << EOF >$dummy.c
|
| + sed 's/^ //' << EOF >$dummy.c
|
|
|
| - #define _HPUX_SOURCE
|
| - #include <stdlib.h>
|
| - #include <unistd.h>
|
| + #define _HPUX_SOURCE
|
| + #include <stdlib.h>
|
| + #include <unistd.h>
|
|
|
| - int main ()
|
| - {
|
| - #if defined(_SC_KERNEL_BITS)
|
| - long bits = sysconf(_SC_KERNEL_BITS);
|
| - #endif
|
| - long cpu = sysconf (_SC_CPU_VERSION);
|
| + int main ()
|
| + {
|
| + #if defined(_SC_KERNEL_BITS)
|
| + long bits = sysconf(_SC_KERNEL_BITS);
|
| + #endif
|
| + long cpu = sysconf (_SC_CPU_VERSION);
|
|
|
| - switch (cpu)
|
| - {
|
| - case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
| - case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
| - case CPU_PA_RISC2_0:
|
| - #if defined(_SC_KERNEL_BITS)
|
| - switch (bits)
|
| - {
|
| - case 64: puts ("hppa2.0w"); break;
|
| - case 32: puts ("hppa2.0n"); break;
|
| - default: puts ("hppa2.0"); break;
|
| - } break;
|
| - #else /* !defined(_SC_KERNEL_BITS) */
|
| - puts ("hppa2.0"); break;
|
| - #endif
|
| - default: puts ("hppa1.0"); break;
|
| - }
|
| - exit (0);
|
| - }
|
| + switch (cpu)
|
| + {
|
| + case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
|
| + case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
|
| + case CPU_PA_RISC2_0:
|
| + #if defined(_SC_KERNEL_BITS)
|
| + switch (bits)
|
| + {
|
| + case 64: puts ("hppa2.0w"); break;
|
| + case 32: puts ("hppa2.0n"); break;
|
| + default: puts ("hppa2.0"); break;
|
| + } break;
|
| + #else /* !defined(_SC_KERNEL_BITS) */
|
| + puts ("hppa2.0"); break;
|
| + #endif
|
| + default: puts ("hppa1.0"); break;
|
| + }
|
| + exit (0);
|
| + }
|
| EOF
|
| (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
|
| test -z "$HP_ARCH" && HP_ARCH=hppa
|
| @@ -730,22 +751,22 @@ EOF
|
| exit ;;
|
| C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
|
| echo c1-convex-bsd
|
| - exit ;;
|
| + exit ;;
|
| C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
|
| if getsysinfo -f scalar_acc
|
| then echo c32-convex-bsd
|
| else echo c2-convex-bsd
|
| fi
|
| - exit ;;
|
| + exit ;;
|
| C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
|
| echo c34-convex-bsd
|
| - exit ;;
|
| + exit ;;
|
| C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
|
| echo c38-convex-bsd
|
| - exit ;;
|
| + exit ;;
|
| C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
|
| echo c4-convex-bsd
|
| - exit ;;
|
| + exit ;;
|
| CRAY*Y-MP:*:*:*)
|
| echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
|
| exit ;;
|
| @@ -769,14 +790,14 @@ EOF
|
| exit ;;
|
| F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
|
| FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
|
| - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
| - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
| - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
| - exit ;;
|
| + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
| + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
| + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
| + exit ;;
|
| 5000:UNIX_System_V:4.*:*)
|
| - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
| - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
|
| - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
| + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
|
| + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
|
| + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
| exit ;;
|
| i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
|
| echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
| @@ -788,30 +809,35 @@ EOF
|
| echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
| exit ;;
|
| *:FreeBSD:*:*)
|
| - case ${UNAME_MACHINE} in
|
| - pc98)
|
| - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
| + UNAME_PROCESSOR=`/usr/bin/uname -p`
|
| + case ${UNAME_PROCESSOR} in
|
| amd64)
|
| echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
| *)
|
| - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
| + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
|
| esac
|
| exit ;;
|
| i*:CYGWIN*:*)
|
| echo ${UNAME_MACHINE}-pc-cygwin
|
| exit ;;
|
| + *:MINGW64*:*)
|
| + echo ${UNAME_MACHINE}-pc-mingw64
|
| + exit ;;
|
| *:MINGW*:*)
|
| echo ${UNAME_MACHINE}-pc-mingw32
|
| exit ;;
|
| + i*:MSYS*:*)
|
| + echo ${UNAME_MACHINE}-pc-msys
|
| + exit ;;
|
| i*:windows32*:*)
|
| - # uname -m includes "-pc" on this system.
|
| - echo ${UNAME_MACHINE}-mingw32
|
| + # uname -m includes "-pc" on this system.
|
| + echo ${UNAME_MACHINE}-mingw32
|
| exit ;;
|
| i*:PW*:*)
|
| echo ${UNAME_MACHINE}-pc-pw32
|
| exit ;;
|
| *:Interix*:*)
|
| - case ${UNAME_MACHINE} in
|
| + case ${UNAME_MACHINE} in
|
| x86)
|
| echo i586-pc-interix${UNAME_RELEASE}
|
| exit ;;
|
| @@ -848,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 ;;
|
| @@ -866,52 +899,56 @@ EOF
|
| EV6) UNAME_MACHINE=alphaev6 ;;
|
| EV67) UNAME_MACHINE=alphaev67 ;;
|
| EV68*) UNAME_MACHINE=alphaev68 ;;
|
| - esac
|
| + 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
|
| - echo ${UNAME_MACHINE}-unknown-linux-gnueabi
|
| + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
|
| + | grep -q __ARM_PCS_VFP
|
| + then
|
| + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
|
| + else
|
| + 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 ${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
|
| @@ -930,51 +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-${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.
|
| @@ -983,11 +1032,11 @@ EOF
|
| echo i386-sequent-sysv4
|
| exit ;;
|
| i*86:UNIX_SV:4.2MP:2.*)
|
| - # Unixware is an offshoot of SVR4, but it has its own version
|
| - # number series starting with 2...
|
| - # I am not positive that other SVR4 systems won't match this,
|
| + # Unixware is an offshoot of SVR4, but it has its own version
|
| + # number series starting with 2...
|
| + # I am not positive that other SVR4 systems won't match this,
|
| # I just have to hope. -- rms.
|
| - # Use sysv4.2uw... so that sysv4* matches it.
|
| + # Use sysv4.2uw... so that sysv4* matches it.
|
| echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
|
| exit ;;
|
| i*86:OS/2:*:*)
|
| @@ -1019,7 +1068,7 @@ EOF
|
| fi
|
| exit ;;
|
| i*86:*:5:[678]*)
|
| - # UnixWare 7.x, OpenUNIX and OpenServer 6.
|
| + # UnixWare 7.x, OpenUNIX and OpenServer 6.
|
| case `/bin/uname -X | grep "^Machine"` in
|
| *486*) UNAME_MACHINE=i486 ;;
|
| *Pentium) UNAME_MACHINE=i586 ;;
|
| @@ -1047,13 +1096,13 @@ EOF
|
| exit ;;
|
| pc:*:*:*)
|
| # Left here for compatibility:
|
| - # uname -m prints for DJGPP always 'pc', but it prints nothing about
|
| - # the processor, so we play safe by assuming i586.
|
| + # uname -m prints for DJGPP always 'pc', but it prints nothing about
|
| + # the processor, so we play safe by assuming i586.
|
| # Note: whatever this is, it MUST be the same as what config.sub
|
| # prints for the "djgpp" host, or else GDB configury will decide that
|
| # this is a cross-build.
|
| echo i586-pc-msdosdjgpp
|
| - exit ;;
|
| + exit ;;
|
| Intel:Mach:3*:*)
|
| echo i386-pc-mach3
|
| exit ;;
|
| @@ -1088,8 +1137,8 @@ EOF
|
| /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
| && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
|
| 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
| - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
| - && { echo i486-ncr-sysv4; exit; } ;;
|
| + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
| + && { echo i486-ncr-sysv4; exit; } ;;
|
| NCR*:*:4.2:* | MPRAS*:*:4.2:*)
|
| OS_REL='.3'
|
| test -r /etc/.relid \
|
| @@ -1132,10 +1181,10 @@ EOF
|
| echo ns32k-sni-sysv
|
| fi
|
| exit ;;
|
| - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
|
| - # says <Richard.M.Bartel@ccMail.Census.GOV>
|
| - echo i586-unisys-sysv4
|
| - exit ;;
|
| + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
|
| + # says <Richard.M.Bartel@ccMail.Census.GOV>
|
| + echo i586-unisys-sysv4
|
| + exit ;;
|
| *:UNIX_System_V:4*:FTX*)
|
| # From Gerald Hewes <hewes@openmarket.com>.
|
| # How about differentiating between stratus architectures? -djm
|
| @@ -1161,11 +1210,11 @@ EOF
|
| exit ;;
|
| R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
|
| if [ -d /usr/nec ]; then
|
| - echo mips-nec-sysv${UNAME_RELEASE}
|
| + echo mips-nec-sysv${UNAME_RELEASE}
|
| else
|
| - echo mips-unknown-sysv${UNAME_RELEASE}
|
| + echo mips-unknown-sysv${UNAME_RELEASE}
|
| fi
|
| - exit ;;
|
| + exit ;;
|
| BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
|
| echo powerpc-be-beos
|
| exit ;;
|
| @@ -1178,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 ;;
|
| @@ -1204,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]*:*)
|
| @@ -1230,7 +1284,10 @@ EOF
|
| *:QNX:*:4*)
|
| echo i386-pc-qnx
|
| exit ;;
|
| - NSE-?:NONSTOP_KERNEL:*:*)
|
| + NEO-?:NONSTOP_KERNEL:*:*)
|
| + echo neo-tandem-nsk${UNAME_RELEASE}
|
| + exit ;;
|
| + NSE-*:NONSTOP_KERNEL:*:*)
|
| echo nse-tandem-nsk${UNAME_RELEASE}
|
| exit ;;
|
| NSR-?:NONSTOP_KERNEL:*:*)
|
| @@ -1275,13 +1332,13 @@ EOF
|
| echo pdp10-unknown-its
|
| exit ;;
|
| SEI:*:*:SEIUX)
|
| - echo mips-sei-seiux${UNAME_RELEASE}
|
| + echo mips-sei-seiux${UNAME_RELEASE}
|
| exit ;;
|
| *:DragonFly:*:*)
|
| echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
| exit ;;
|
| *:*VMS:*:*)
|
| - UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
| + UNAME_MACHINE=`(uname -p) 2>/dev/null`
|
| case "${UNAME_MACHINE}" in
|
| A*) echo alpha-dec-vms ; exit ;;
|
| I*) echo ia64-dec-vms ; exit ;;
|
| @@ -1299,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_
|
| @@ -1321,11 +1378,11 @@ main ()
|
| #include <sys/param.h>
|
| printf ("m68k-sony-newsos%s\n",
|
| #ifdef NEWSOS4
|
| - "4"
|
| + "4"
|
| #else
|
| - ""
|
| + ""
|
| #endif
|
| - ); exit (0);
|
| + ); exit (0);
|
| #endif
|
| #endif
|
|
|
|
|