| diff -ur librsvg-2.36.1-orig/config.guess librsvg-2.36.1/config.guess |
| --- librsvg-2.36.1-orig/config.guess 2012-02-03 13:14:58.000000000 +0100 |
| +++ librsvg-2.36.1/config.guess 2014-09-25 18:36:54.000000000 +0200 |
| @@ -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-2014 Free Software Foundation, Inc. |
| |
| -timestamp='2009-11-20' |
| +timestamp='2014-03-23' |
| |
| # 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 @@ |
| # 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 @@ |
| 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-2014 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_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' | sed 's, ,,g'` |
| + ;; |
| +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 @@ |
| fi |
| ;; |
| *) |
| - os=netbsd |
| + os=netbsd |
| ;; |
| esac |
| # The OS release |
| @@ -201,6 +215,10 @@ |
| # 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 @@ |
| 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 @@ |
| # 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 @@ |
| 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 @@ |
| # 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 @@ |
| 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 @@ |
| else |
| echo i586-dg-dgux${UNAME_RELEASE} |
| fi |
| - exit ;; |
| + exit ;; |
| M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
| echo m88k-dolphin-sysv3 |
| exit ;; |
| @@ -551,7 +572,7 @@ |
| 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 @@ |
| 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> |
| + |
| + int main () |
| + { |
| + #if defined(_SC_KERNEL_BITS) |
| + long bits = sysconf(_SC_KERNEL_BITS); |
| + #endif |
| + long cpu = sysconf (_SC_CPU_VERSION); |
| |
| - #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); |
| - |
| - 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 @@ |
| 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 @@ |
| 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 @@ |
| 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 ;; |
| + *: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 @@ |
| 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 @@ |
| 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 @@ |
| #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 or32-unknown-linux-gnu |
| + openrisc*:Linux:*:*) |
| + echo or1k-unknown-linux-${LIBC} |
| + exit ;; |
| + or32:Linux:*:* | or1k*:Linux:*:*) |
| + 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 @@ |
| 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 @@ |
| 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 @@ |
| 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 @@ |
| /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 @@ |
| 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 @@ |
| 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 @@ |
| 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,31 @@ |
| 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 test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then |
| + 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 |
| + elif test "$UNAME_PROCESSOR" = i386 ; then |
| + # Avoid executing cc on OS X 10.9, as it ships with a stub |
| + # that puts up a graphical alert prompting to install |
| + # developer tools. Any system running Mac OS X 10.7 or |
| + # later (Darwin 11 and later) is required to have a 64-bit |
| + # processor. This is not true of the ARM version of Darwin |
| + # that Apple uses in portable devices. |
| + UNAME_PROCESSOR=x86_64 |
| + fi |
| echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
| exit ;; |
| *:procnto*:*:* | *:QNX:[0123456789]*:*) |
| @@ -1230,7 +1294,10 @@ |
| *: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 +1342,13 @@ |
| 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,158 +1366,10 @@ |
| i*86:AROS:*:*) |
| echo ${UNAME_MACHINE}-pc-aros |
| 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_ |
| -# include <sys/types.h> |
| -# include <sys/utsname.h> |
| -#endif |
| -main () |
| -{ |
| -#if defined (sony) |
| -#if defined (MIPSEB) |
| - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
| - I don't know.... */ |
| - printf ("mips-sony-bsd\n"); exit (0); |
| -#else |
| -#include <sys/param.h> |
| - printf ("m68k-sony-newsos%s\n", |
| -#ifdef NEWSOS4 |
| - "4" |
| -#else |
| - "" |
| -#endif |
| - ); exit (0); |
| -#endif |
| -#endif |
| - |
| -#if defined (__arm) && defined (__acorn) && defined (__unix) |
| - printf ("arm-acorn-riscix\n"); exit (0); |
| -#endif |
| - |
| -#if defined (hp300) && !defined (hpux) |
| - printf ("m68k-hp-bsd\n"); exit (0); |
| -#endif |
| - |
| -#if defined (NeXT) |
| -#if !defined (__ARCHITECTURE__) |
| -#define __ARCHITECTURE__ "m68k" |
| -#endif |
| - int version; |
| - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
| - if (version < 4) |
| - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
| - else |
| - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
| - exit (0); |
| -#endif |
| - |
| -#if defined (MULTIMAX) || defined (n16) |
| -#if defined (UMAXV) |
| - printf ("ns32k-encore-sysv\n"); exit (0); |
| -#else |
| -#if defined (CMU) |
| - printf ("ns32k-encore-mach\n"); exit (0); |
| -#else |
| - printf ("ns32k-encore-bsd\n"); exit (0); |
| -#endif |
| -#endif |
| -#endif |
| - |
| -#if defined (__386BSD__) |
| - printf ("i386-pc-bsd\n"); exit (0); |
| -#endif |
| - |
| -#if defined (sequent) |
| -#if defined (i386) |
| - printf ("i386-sequent-dynix\n"); exit (0); |
| -#endif |
| -#if defined (ns32000) |
| - printf ("ns32k-sequent-dynix\n"); exit (0); |
| -#endif |
| -#endif |
| - |
| -#if defined (_SEQUENT_) |
| - struct utsname un; |
| - |
| - uname(&un); |
| - |
| - if (strncmp(un.version, "V2", 2) == 0) { |
| - printf ("i386-sequent-ptx2\n"); exit (0); |
| - } |
| - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
| - printf ("i386-sequent-ptx1\n"); exit (0); |
| - } |
| - printf ("i386-sequent-ptx\n"); exit (0); |
| - |
| -#endif |
| - |
| -#if defined (vax) |
| -# if !defined (ultrix) |
| -# include <sys/param.h> |
| -# if defined (BSD) |
| -# if BSD == 43 |
| - printf ("vax-dec-bsd4.3\n"); exit (0); |
| -# else |
| -# if BSD == 199006 |
| - printf ("vax-dec-bsd4.3reno\n"); exit (0); |
| -# else |
| - printf ("vax-dec-bsd\n"); exit (0); |
| -# endif |
| -# endif |
| -# else |
| - printf ("vax-dec-bsd\n"); exit (0); |
| -# endif |
| -# else |
| - printf ("vax-dec-ultrix\n"); exit (0); |
| -# endif |
| -#endif |
| - |
| -#if defined (alliant) && defined (i860) |
| - printf ("i860-alliant-bsd\n"); exit (0); |
| -#endif |
| - |
| - exit (1); |
| -} |
| -EOF |
| - |
| -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
| - { echo "$SYSTEM_NAME"; exit; } |
| - |
| -# Apollos put the system type in the environment. |
| - |
| -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
| - |
| -# Convex versions that predate uname can use getsysinfo(1) |
| - |
| -if [ -x /usr/convex/getsysinfo ] |
| -then |
| - case `getsysinfo -f cpu_type` in |
| - c1*) |
| - echo c1-convex-bsd |
| - exit ;; |
| - c2*) |
| - if getsysinfo -f scalar_acc |
| - then echo c32-convex-bsd |
| - else echo c2-convex-bsd |
| - fi |
| + x86_64:VMkernel:*:*) |
| + echo ${UNAME_MACHINE}-unknown-esx |
| exit ;; |
| - c34*) |
| - echo c34-convex-bsd |
| - exit ;; |
| - c38*) |
| - echo c38-convex-bsd |
| - exit ;; |
| - c4*) |
| - echo c4-convex-bsd |
| - exit ;; |
| - esac |
| -fi |
| +esac |
| |
| cat >&2 <<EOF |
| $0: unable to guess system type |
| diff -ur librsvg-2.36.1-orig/config.sub librsvg-2.36.1/config.sub |
| --- librsvg-2.36.1-orig/config.sub 2012-02-03 13:14:58.000000000 +0100 |
| +++ librsvg-2.36.1/config.sub 2014-09-25 18:37:12.000000000 +0200 |
| @@ -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 |
| -# Free Software Foundation, Inc. |
| - |
| -timestamp='2009-11-20' |
| - |
| -# 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 |
| +# Copyright 1992-2014 Free Software Foundation, Inc. |
| + |
| +timestamp='2014-09-11' |
| + |
| +# 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,8 +68,7 @@ |
| version="\ |
| GNU config.sub ($timestamp) |
| |
| -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-2014 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." |
| @@ -123,13 +115,18 @@ |
| # Here we must recognize all the valid KERNEL-OS combinations. |
| maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
| case $maybe_os in |
| - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
| - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
| + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
| + 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 ] |
| @@ -152,12 +149,12 @@ |
| -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 |
| ;; |
| - -bluegene*) |
| - os=-cnk |
| + -bluegene*) |
| + os=-cnk |
| ;; |
| -sim | -cisco | -oki | -wec | -winbond) |
| os= |
| @@ -173,10 +170,10 @@ |
| os=-chorusos |
| basic_machine=$1 |
| ;; |
| - -chorusrdb) |
| - os=-chorusrdb |
| + -chorusrdb) |
| + os=-chorusrdb |
| basic_machine=$1 |
| - ;; |
| + ;; |
| -hiux*) |
| os=-hiuxwe2 |
| ;; |
| @@ -221,6 +218,12 @@ |
| -isc*) |
| basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
| ;; |
| + -lynx*178) |
| + os=-lynxos178 |
| + ;; |
| + -lynx*5) |
| + os=-lynxos5 |
| + ;; |
| -lynx*) |
| os=-lynxos |
| ;; |
| @@ -245,20 +248,28 @@ |
| # 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 \ |
| + | arc | arceb \ |
| + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
| + | avr | avr32 \ |
| + | be32 | be64 \ |
| | bfin \ |
| - | c4x | clipper \ |
| + | c4x | c8051 | clipper \ |
| | d10v | d30v | dlx | dsp16xx \ |
| + | epiphany \ |
| | fido | fr30 | frv \ |
| | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
| + | hexagon \ |
| | i370 | i860 | i960 | ia64 \ |
| | ip2k | iq2000 \ |
| + | k1om \ |
| + | 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 \ |
| @@ -272,38 +283,51 @@ |
| | mips64vr5900 | mips64vr5900el \ |
| | mipsisa32 | mipsisa32el \ |
| | mipsisa32r2 | mipsisa32r2el \ |
| + | mipsisa32r6 | mipsisa32r6el \ |
| | mipsisa64 | mipsisa64el \ |
| | mipsisa64r2 | mipsisa64r2el \ |
| + | mipsisa64r6 | mipsisa64r6el \ |
| | mipsisa64sb1 | mipsisa64sb1el \ |
| | mipsisa64sr71k | mipsisa64sr71kel \ |
| + | mipsr5900 | mipsr5900el \ |
| | mipstx39 | mipstx39el \ |
| | mn10200 | mn10300 \ |
| | moxie \ |
| | mt \ |
| | msp430 \ |
| - | nios | nios2 \ |
| + | nds32 | nds32le | nds32be \ |
| + | nios | nios2 | nios2eb | nios2el \ |
| | ns16k | ns32k \ |
| - | or32 \ |
| + | open8 | or1k | or1knd | or32 \ |
| | pdp10 | pdp11 | pj | pjl \ |
| - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
| + | powerpc | powerpc64 | powerpc64le | powerpcle \ |
| | pyramid \ |
| - | rx \ |
| + | riscv32 | riscv64 \ |
| + | rl78 | rx \ |
| | score \ |
| | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
| | sh64 | sh64le \ |
| | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
| | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
| - | spu | strongarm \ |
| - | tahoe | thumb | tic4x | tic80 | tron \ |
| + | spu \ |
| + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ |
| | ubicom32 \ |
| - | v850 | v850e \ |
| + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
| | we32k \ |
| - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
| + | x86 | xc16x | xstormy16 | xtensa \ |
| | z8k | z80) |
| basic_machine=$basic_machine-unknown |
| ;; |
| - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
| - # Motorola 68HC11/12. |
| + c54x) |
| + basic_machine=tic54x-unknown |
| + ;; |
| + c55x) |
| + basic_machine=tic55x-unknown |
| + ;; |
| + c6x) |
| + basic_machine=tic6x-unknown |
| + ;; |
| + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) |
| basic_machine=$basic_machine-unknown |
| os=-none |
| ;; |
| @@ -313,6 +337,21 @@ |
| basic_machine=mt-unknown |
| ;; |
| |
| + strongarm | thumb | xscale) |
| + basic_machine=arm-unknown |
| + ;; |
| + xgate) |
| + basic_machine=$basic_machine-unknown |
| + os=-none |
| + ;; |
| + xscaleeb) |
| + basic_machine=armeb-unknown |
| + ;; |
| + |
| + xscaleel) |
| + basic_machine=armel-unknown |
| + ;; |
| + |
| # We use `pc' rather than `unknown' |
| # because (1) that's what they normally are, and |
| # (2) the word "unknown" tends to confuse beginning users. |
| @@ -327,25 +366,31 @@ |
| # 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-* \ |
| | bfin-* | bs2000-* \ |
| - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
| - | clipper-* | craynv-* | cydra-* \ |
| + | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
| + | c8051-* | clipper-* | craynv-* | cydra-* \ |
| | d10v-* | d30v-* | dlx-* \ |
| | elxsi-* \ |
| | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
| | h8300-* | h8500-* \ |
| | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
| + | hexagon-* \ |
| | i*86-* | i860-* | i960-* | ia64-* \ |
| | ip2k-* | iq2000-* \ |
| + | k1om-* \ |
| + | le32-* | le64-* \ |
| | 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-* \ |
| @@ -359,33 +404,41 @@ |
| | mips64vr5900-* | mips64vr5900el-* \ |
| | mipsisa32-* | mipsisa32el-* \ |
| | mipsisa32r2-* | mipsisa32r2el-* \ |
| + | mipsisa32r6-* | mipsisa32r6el-* \ |
| | mipsisa64-* | mipsisa64el-* \ |
| | mipsisa64r2-* | mipsisa64r2el-* \ |
| + | mipsisa64r6-* | mipsisa64r6el-* \ |
| | mipsisa64sb1-* | mipsisa64sb1el-* \ |
| | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
| + | mipsr5900-* | mipsr5900el-* \ |
| | mipstx39-* | mipstx39el-* \ |
| | mmix-* \ |
| | mt-* \ |
| | msp430-* \ |
| - | nios-* | nios2-* \ |
| + | nds32-* | nds32le-* | nds32be-* \ |
| + | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
| | none-* | np1-* | ns16k-* | ns32k-* \ |
| + | open8-* \ |
| + | or1k*-* \ |
| | orion-* \ |
| | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
| - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
| + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ |
| | pyramid-* \ |
| - | romp-* | rs6000-* | rx-* \ |
| + | rl78-* | romp-* | rs6000-* | rx-* \ |
| | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
| | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
| | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
| | sparclite-* \ |
| - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
| - | tahoe-* | thumb-* \ |
| - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ |
| + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ |
| + | tahoe-* \ |
| + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
| + | tile*-* \ |
| | tron-* \ |
| | ubicom32-* \ |
| - | v850-* | v850e-* | vax-* \ |
| + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ |
| + | vax-* \ |
| | we32k-* \ |
| - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
| + | x86-* | x86_64-* | xc16x-* | xps100-* \ |
| | xstormy16-* | xtensa*-* \ |
| | ymp-* \ |
| | z8k-* | z80-*) |
| @@ -410,7 +463,7 @@ |
| basic_machine=a29k-amd |
| os=-udi |
| ;; |
| - abacus) |
| + abacus) |
| basic_machine=abacus-unknown |
| ;; |
| adobe68k) |
| @@ -480,11 +533,20 @@ |
| basic_machine=powerpc-ibm |
| os=-cnk |
| ;; |
| + c54x-*) |
| + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` |
| + ;; |
| + c55x-*) |
| + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` |
| + ;; |
| + c6x-*) |
| + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` |
| + ;; |
| c90) |
| basic_machine=c90-cray |
| os=-unicos |
| ;; |
| - cegcc) |
| + cegcc) |
| basic_machine=arm-unknown |
| os=-cegcc |
| ;; |
| @@ -516,7 +578,7 @@ |
| basic_machine=craynv-cray |
| os=-unicosmp |
| ;; |
| - cr16) |
| + cr16 | cr16-*) |
| basic_machine=cr16-unknown |
| os=-elf |
| ;; |
| @@ -674,7 +736,6 @@ |
| 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 |
| @@ -732,11 +793,15 @@ |
| 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 |
| + basic_machine=i686-pc |
| os=-mingw32 |
| ;; |
| mingw32ce) |
| @@ -764,6 +829,10 @@ |
| basic_machine=powerpc-unknown |
| os=-morphos |
| ;; |
| + moxiebox) |
| + basic_machine=moxie-unknown |
| + os=-moxiebox |
| + ;; |
| msdos) |
| basic_machine=i386-pc |
| os=-msdos |
| @@ -771,10 +840,18 @@ |
| ms1-*) |
| basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
| ;; |
| + msys) |
| + basic_machine=i686-pc |
| + os=-msys |
| + ;; |
| mvs) |
| basic_machine=i370-ibm |
| os=-mvs |
| ;; |
| + nacl) |
| + basic_machine=le32-unknown |
| + os=-nacl |
| + ;; |
| ncr3000) |
| basic_machine=i486-ncr |
| os=-sysv4 |
| @@ -839,6 +916,12 @@ |
| np1) |
| basic_machine=np1-gould |
| ;; |
| + neo-tandem) |
| + basic_machine=neo-tandem |
| + ;; |
| + nse-tandem) |
| + basic_machine=nse-tandem |
| + ;; |
| nsr-tandem) |
| basic_machine=nsr-tandem |
| ;; |
| @@ -921,9 +1004,10 @@ |
| ;; |
| power) basic_machine=power-ibm |
| ;; |
| - ppc) basic_machine=powerpc-unknown |
| + ppc | ppcbe) basic_machine=powerpc-unknown |
| ;; |
| - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
| + ppc-* | ppcbe-*) |
| + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
| ;; |
| ppcle | powerpclittle | ppc-le | powerpc-little) |
| basic_machine=powerpcle-unknown |
| @@ -948,7 +1032,11 @@ |
| basic_machine=i586-unknown |
| os=-pw32 |
| ;; |
| - rdos) |
| + rdos | rdos64) |
| + basic_machine=x86_64-pc |
| + os=-rdos |
| + ;; |
| + rdos32) |
| basic_machine=i386-pc |
| os=-rdos |
| ;; |
| @@ -1017,6 +1105,9 @@ |
| basic_machine=i860-stratus |
| os=-sysv4 |
| ;; |
| + strongarm-* | thumb-*) |
| + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` |
| + ;; |
| sun2) |
| basic_machine=m68000-sun |
| ;; |
| @@ -1073,20 +1164,8 @@ |
| basic_machine=t90-cray |
| os=-unicos |
| ;; |
| - tic54x | c54x*) |
| - basic_machine=tic54x-unknown |
| - os=-coff |
| - ;; |
| - tic55x | c55x*) |
| - basic_machine=tic55x-unknown |
| - os=-coff |
| - ;; |
| - tic6x | c6x*) |
| - basic_machine=tic6x-unknown |
| - os=-coff |
| - ;; |
| tile*) |
| - basic_machine=tile-unknown |
| + basic_machine=$basic_machine-unknown |
| os=-linux-gnu |
| ;; |
| tx39) |
| @@ -1156,6 +1235,9 @@ |
| xps | xps100) |
| basic_machine=xps100-honeywell |
| ;; |
| + xscale-* | xscalee[bl]-*) |
| + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` |
| + ;; |
| ymp) |
| basic_machine=ymp-cray |
| os=-unicos |
| @@ -1253,11 +1335,11 @@ |
| if [ x"$os" != x"" ] |
| then |
| case $os in |
| - # First match some system type aliases |
| - # that might get confused with valid system types. |
| + # First match some system type aliases |
| + # that might get confused with valid system types. |
| # -solaris* is a basic system type, with this one exception. |
| - -auroraux) |
| - os=-auroraux |
| + -auroraux) |
| + os=-auroraux |
| ;; |
| -solaris1 | -solaris1.*) |
| os=`echo $os | sed -e 's|solaris1|sunos4|'` |
| @@ -1281,28 +1363,29 @@ |
| -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* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
| - | -uxpv* | -beos* | -mpeix* | -udk* \ |
| + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
| + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
| + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
| + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ |
| | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
| | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
| | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
| | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
| | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
| | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
| - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
| + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) |
| # Remember, each alternative MUST END IN *, to match a version number. |
| ;; |
| -qnx*) |
| @@ -1341,7 +1424,7 @@ |
| -opened*) |
| os=-openedition |
| ;; |
| - -os400*) |
| + -os400*) |
| os=-os400 |
| ;; |
| -wince*) |
| @@ -1390,7 +1473,7 @@ |
| -sinix*) |
| os=-sysv4 |
| ;; |
| - -tpf*) |
| + -tpf*) |
| os=-tpf |
| ;; |
| -triton*) |
| @@ -1426,15 +1509,14 @@ |
| -aros*) |
| os=-aros |
| ;; |
| - -kaos*) |
| - os=-kaos |
| - ;; |
| -zvmoe) |
| os=-zvmoe |
| ;; |
| -dicos*) |
| os=-dicos |
| ;; |
| + -nacl*) |
| + ;; |
| -none) |
| ;; |
| *) |
| @@ -1457,10 +1539,10 @@ |
| # system, and we'll never get to this point. |
| |
| case $basic_machine in |
| - score-*) |
| + score-*) |
| os=-elf |
| ;; |
| - spu-*) |
| + spu-*) |
| os=-elf |
| ;; |
| *-acorn) |
| @@ -1472,8 +1554,23 @@ |
| arm*-semi) |
| os=-aout |
| ;; |
| - c4x-* | tic4x-*) |
| - os=-coff |
| + c4x-* | tic4x-*) |
| + os=-coff |
| + ;; |
| + c8051-*) |
| + os=-elf |
| + ;; |
| + hexagon-*) |
| + os=-elf |
| + ;; |
| + tic54x-*) |
| + os=-coff |
| + ;; |
| + tic55x-*) |
| + os=-coff |
| + ;; |
| + tic6x-*) |
| + os=-coff |
| ;; |
| # This must come before the *-dec entry. |
| pdp10-*) |
| @@ -1493,14 +1590,11 @@ |
| ;; |
| m68000-sun) |
| os=-sunos3 |
| - # This also exists in the configure program, but was not the |
| - # default. |
| - # os=-sunos4 |
| ;; |
| m68*-cisco) |
| os=-aout |
| ;; |
| - mep-*) |
| + mep-*) |
| os=-elf |
| ;; |
| mips*-cisco) |
| @@ -1527,7 +1621,7 @@ |
| *-ibm) |
| os=-aix |
| ;; |
| - *-knuth) |
| + *-knuth) |
| os=-mmixware |
| ;; |
| *-wec) |
