From e6f22a087cabe44bd7e88a99d31405d5910a544e68aa339de1e76ebb782bea46 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 17 Jun 2013 12:42:23 +0000 Subject: [PATCH] Accepting request 179216 from home:jengelh:branches:Base:System - Update to new upstream release 2.4.47 OBS-URL: https://build.opensuse.org/request/show/179216 OBS-URL: https://build.opensuse.org/package/show/Base:System/attr?expand=0&rev=34 --- attr-2.4.46.src.tar.gz | 3 - attr-2.4.47.src.tar.gz | 3 + attr-2.4.47.src.tar.gz.sig | Bin 0 -> 543 bytes attr-syscalls.patch | 25 - attr.changes | 12 + attr.keyring | 201 ++++++ attr.spec | 64 +- baselibs.conf | 3 +- builddefs.in.diff | 17 - config-guess-sub-update.patch | 1221 --------------------------------- 10 files changed, 246 insertions(+), 1303 deletions(-) delete mode 100644 attr-2.4.46.src.tar.gz create mode 100644 attr-2.4.47.src.tar.gz create mode 100644 attr-2.4.47.src.tar.gz.sig delete mode 100644 attr-syscalls.patch create mode 100644 attr.keyring delete mode 100644 builddefs.in.diff delete mode 100644 config-guess-sub-update.patch diff --git a/attr-2.4.46.src.tar.gz b/attr-2.4.46.src.tar.gz deleted file mode 100644 index facd0b8..0000000 --- a/attr-2.4.46.src.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f -size 338181 diff --git a/attr-2.4.47.src.tar.gz b/attr-2.4.47.src.tar.gz new file mode 100644 index 0000000..9275192 --- /dev/null +++ b/attr-2.4.47.src.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 +size 343692 diff --git a/attr-2.4.47.src.tar.gz.sig b/attr-2.4.47.src.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..9dc971e3e99467869c90e7cf6e32a6406dbb7349370d00d0a844b30f6377553f GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-l+-nIY=2@n-SLnZ}6-!yiY5B?yRusZK;23X!YDhAEa z#$?&A_$IqSmB7(Lb?aacO7I&Y0%N5mVCl20^B zI`L+^lA_krH9ksQTdwz-{o`{$DhlxHTf*;(4eJ&H!{Ol2F z5EM&+>z0Nimh}3WFJPE^JRTo}IJZ=__ZS<)ZRQtcDi&hw9lvP=(jbp6?s%pyb8M`N z_!3iC$rk^b49nHWEzS-G&~t_8Jcp4I>=vjr{XFw24q95$%0K@%Hw|>L6jxDOOWIgJ zwLa#4n1jhy%Fuq4tpbDsdqAHh<&E9lD|CXKnU;{~;JTTW_?00$V+-q!2zXKQuF#;5 z`N?T#xr$W(RWtuIZ;}2H0pZ%9)Y1a-6dc{X*Zp!dztCRpD_9)nTl4I)JXt`q*$DHk;3;ZGWb60slemsQ$A>(P2R%0;iFIFZBOI zuAZmw{SVF{@95;k=eisJvd?{z=woE*0PGSr_xE43Yz}aLU3gjsL(8};uevFf>_v>5 zyUI-OC;8ERk}RgnjNNU-%M>4W6K(@{^(b6KPwQfbxpWzWaEuuro%un)88s>)4A1kg h=V+09ySdtrrAdU6Hf>b&xtLlbbLo>*Ay7!#eTpz&4N?FA literal 0 HcmV?d00001 diff --git a/attr-syscalls.patch b/attr-syscalls.patch deleted file mode 100644 index bc02b5f..0000000 --- a/attr-syscalls.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: libattr/syscalls.c -=================================================================== ---- libattr/syscalls.c.orig -+++ libattr/syscalls.c -@@ -189,6 +189,20 @@ - # define __NR_removexattr 232 - # define __NR_lremovexattr 233 - # define __NR_fremovexattr 234 -+#elif defined (__aarch64__) -+# define HAVE_XATTR_SYSCALLS 1 -+# define __NR_setxattr 5 -+# define __NR_lsetxattr 6 -+# define __NR_fsetxattr 7 -+# define __NR_getxattr 8 -+# define __NR_lgetxattr 9 -+# define __NR_fgetxattr 10 -+# define __NR_listxattr 11 -+# define __NR_llistxattr 12 -+# define __NR_flistxattr 13 -+# define __NR_removexattr 14 -+# define __NR_lremovexattr 15 -+# define __NR_fremovexattr 16 - #else - # warning "Extended attribute syscalls undefined for this architecture" - # define HAVE_XATTR_SYSCALLS 0 diff --git a/attr.changes b/attr.changes index 246e07c..018a04a 100644 --- a/attr.changes +++ b/attr.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jun 16 21:53:46 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 2.4.47 +* This release fixes two functional bugs related to tree walking + and the return code from getfattr. Also, a number of build system + problems were fixed. +- Remove config-guess-sub-update.patch (no longer applies), + attr-syscalls.patch (resolved differently upstream), + builddefs.in.diff (replaced by logic in specfile) +- Signature verification + ------------------------------------------------------------------- Wed Mar 20 13:02:40 UTC 2013 - mmeister@suse.com diff --git a/attr.keyring b/attr.keyring new file mode 100644 index 0000000..1de9ae5 --- /dev/null +++ b/attr.keyring @@ -0,0 +1,201 @@ +pub 4096R/5D1B36D7 2013-03-10 [utgår: 2014-03-10] +uid Andreas Gruenbacher +uid Andreas Gruenbacher +uid Andreas Gruenbacher +uid Andreas Gruenbacher +sub 4096R/1E505CE8 2013-03-10 [utgår: 2014-03-10] + +pub 1024D/556B46D6 2007-02-27 +uid Brandon Philips +sub 4096g/14FC8E8F 2007-02-27 + +pub 4096R/0542DF34 2013-05-09 +uid Brandon Philips +uid Brandon Philips (CoreOS, Inc) +sub 4096R/D79749E7 2013-05-09 + +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.19 (GNU/Linux) + +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 +KnEMkpgpvVhQ +=qdVK +-----END PGP PUBLIC KEY BLOCK----- diff --git a/attr.spec b/attr.spec index 79c4f14..6da50ae 100644 --- a/attr.spec +++ b/attr.spec @@ -21,16 +21,22 @@ Name: attr Summary: Commands for Manipulating Extended Attributes License: GPL-2.0+ and LGPL-2.1+ Group: System/Filesystems -Version: 2.4.46 +Version: 2.4.47 Release: 0 -Source: http://download.savannah.gnu.org/releases-noredirect/attr/%{name}-%{version}.src.tar.gz -Source1: xattr.conf -Source2: baselibs.conf -Patch0: builddefs.in.diff -Patch1: config-guess-sub-update.patch -Patch2: attr-syscalls.patch Url: http://download.savannah.gnu.org/releases-noredirect/attr/ + +#Git-Web: http://git.savannah.gnu.org/cgit/attr.git/ +#Git-Clone: git://git.sv.gnu.org/attr +Source: http://download.savannah.gnu.org/releases-noredirect/attr/%{name}-%{version}.src.tar.gz +Source2: http://download.savannah.gnu.org/releases-noredirect/attr/%{name}-%{version}.src.tar.gz.sig +Source3: %name.keyring +Source4: xattr.conf +Source5: baselibs.conf +#Patch0: builddefs.in.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif Conflicts: xfsdump < 2.0.0 %description @@ -46,7 +52,7 @@ Group: System/Libraries %ifarch ppc64 Obsoletes: libattr-64bit %endif -# +# Added for 12.1 Obsoletes: libattr < %version-%release Provides: libattr = %version-%release @@ -57,8 +63,8 @@ the extended attribute library functions. %package -n libattr-devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Provides: attr-devel -Obsoletes: attr-devel +Provides: attr-devel = %version-%release +Obsoletes: attr-devel < %version-%release # bug437293 %ifarch ppc64 Obsoletes: libattr-devel-64bit @@ -84,41 +90,27 @@ This package contains the static library of libattr which is needed to develop statically linked programs which make use of extended attributes. %prep +%{?gpg_verify: %gpg_verify %{S:2}} %setup -q -%patch0 -p1 -%patch1 -%patch2 %build export OPTIMIZER="$RPM_OPT_FLAGS -fPIC" export DEBUG=-DNDEBUG -CFLAGS="$RPM_OPT_FLAGS" \ -%configure \ - --prefix=/ \ - --exec-prefix=/ \ - --sbindir=/bin \ - --libdir=/%{_lib} \ - --libexecdir=/%{_libdir} \ - --with-pic +%configure --with-pic --enable-static %{__make} %{?_smp_mflags} %install -DIST_ROOT="$RPM_BUILD_ROOT" -DIST_INSTALL=`pwd`/install.manifest -DIST_INSTALL_DEV=`pwd`/install-dev.manifest -DIST_INSTALL_LIB=`pwd`/install-lib.manifest -export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB -/usr/bin/make install DIST_MANIFEST="$DIST_INSTALL" -/usr/bin/make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV" -/usr/bin/make install-lib DIST_MANIFEST="$DIST_INSTALL_LIB" -ln -sf /%{_lib}/$(readlink $RPM_BUILD_ROOT/%{_lib}/libattr.so) \ - $RPM_BUILD_ROOT/%{_libdir}/libattr.so -rm -f $RPM_BUILD_ROOT/%{_lib}/libattr.{a,la,so} -rm -f $RPM_BUILD_ROOT%{_mandir}/man2/*xattr.2* -rm -f $RPM_BUILD_ROOT/%{_libdir}/libattr.la +b="%buildroot" +make install install-lib install-dev DESTDIR="$b" PKG_DOC_DIR="%_docdir/%name" + +mkdir -p "$b/%_lib/" +mv "$b/%_libdir"/libattr.so.* "$b/%_lib/" +t=$(readlink "$b/%_libdir/libattr.so") +ln -sf "/%_lib/$t" "$b/%_libdir/libattr.so" +rm -f "$b/%_libdir"/*.la +rm -fv $RPM_BUILD_ROOT%{_mandir}/man2/*xattr.2* install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir} install -m 644 %_sourcedir/xattr.conf $RPM_BUILD_ROOT/%{_sysconfdir} -chmod 755 $RPM_BUILD_ROOT/%{_lib}/libattr.so.1* %find_lang %name %post -n %lname -p /sbin/ldconfig @@ -167,5 +159,7 @@ chmod 755 $RPM_BUILD_ROOT/%{_lib}/libattr.so.1* %defattr (-,root,root) /%{_lib}/libattr.so.1* %config %{_sysconfdir}/xattr.conf +%dir %attr(755,root,root) /usr/share/doc/packages/attr +%doc %attr(644,root,root) /usr/share/doc/packages/attr/COPYING.LGPL %changelog diff --git a/baselibs.conf b/baselibs.conf index da994f3..8bc8072 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,6 +1,5 @@ -# obsoletes added in 2.4.46; change to just "<" in 2.4.47 or up libattr1 - obsoletes "libattr- <= " + obsoletes "libattr- < " provides "libattr- = " libattr-devel requires -libattr- diff --git a/builddefs.in.diff b/builddefs.in.diff deleted file mode 100644 index 6adccb7..0000000 --- a/builddefs.in.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- - include/builddefs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: attr-2.4.43/include/builddefs.in -=================================================================== ---- attr-2.4.43.orig/include/builddefs.in -+++ attr-2.4.43/include/builddefs.in -@@ -33,7 +33,7 @@ PKG_LIB_DIR = @libdir@@libdirsuffix@ - PKG_DEVLIB_DIR = @libexecdir@@libdirsuffix@ - PKG_INC_DIR = @includedir@/attr - PKG_MAN_DIR = @mandir@ --PKG_DOC_DIR = @datadir@/doc/@pkg_name@ -+PKG_DOC_DIR = @datadir@/doc/packages/@pkg_name@ - PKG_LOCALE_DIR = @datadir@/locale - - CC = @cc@ diff --git a/config-guess-sub-update.patch b/config-guess-sub-update.patch deleted file mode 100644 index 1c9ee31..0000000 --- a/config-guess-sub-update.patch +++ /dev/null @@ -1,1221 +0,0 @@ -Index: config.guess -=================================================================== ---- config.guess.orig -+++ config.guess -@@ -1,14 +1,14 @@ - #! /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 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2010-08-21' -+timestamp='2012-12-30' - - # 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 +17,22 @@ timestamp='2010-08-21' - # 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 . - # - # 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 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,.*/,,'` - -@@ -57,8 +53,8 @@ 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 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 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." -@@ -92,7 +88,7 @@ if test $# != 0; then - exit 1 - fi - --trap 'exit 1' HUP INT TERM -+trap 'exit 1' 1 2 15 - - # CC_FOR_BUILD -- compiler used by this script. Note that the use of a - # compiler to aid in system detection is discouraged as it requires -@@ -106,7 +102,7 @@ trap 'exit 1' HUP INT TERM - - set_cc_for_build=' - trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; --trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; -+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; - : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || -@@ -145,7 +141,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` | - 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 -@@ -181,7 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -202,6 +198,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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} -@@ -224,7 +224,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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 -@@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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 -@@ -296,12 +299,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - 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:*:*) -@@ -395,23 +398,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ - # 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 ;; -@@ -481,8 +484,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 ] || \ -@@ -495,7 +498,7 @@ EOF - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -595,52 +598,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 -+ #include - -- #define _HPUX_SOURCE -- #include -- #include -- -- 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); -- } -+ 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); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -731,22 +734,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 ;; -@@ -770,14 +773,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} -@@ -789,30 +792,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 ;; -@@ -858,6 +866,13 @@ EOF - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -867,7 +882,7 @@ 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} -@@ -879,20 +894,29 @@ EOF - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - 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-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -934,7 +958,7 @@ EOF - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu -@@ -960,7 +984,7 @@ EOF - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu -@@ -969,16 +993,16 @@ EOF - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-tilera-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -987,11 +1011,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:*:*) -@@ -1023,7 +1047,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 ;; -@@ -1051,13 +1075,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 ;; -@@ -1092,8 +1116,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 \ -@@ -1136,10 +1160,10 @@ EOF - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1165,11 +1189,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 ;; -@@ -1182,6 +1206,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 ;; -@@ -1234,7 +1261,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:*:*) -@@ -1279,13 +1309,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 ;; -@@ -1303,11 +1333,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 < - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -Index: config.sub -=================================================================== ---- config.sub.orig -+++ config.sub -@@ -1,38 +1,33 @@ - #! /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 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012, 2013 Free Software Foundation, Inc. - --timestamp='2010-09-11' -+timestamp='2013-01-23' - --# 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 . - # - # 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 . 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. -@@ -76,8 +71,8 @@ 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 Free --Software Foundation, Inc. -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, -+2012, 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 +120,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,12 +153,12 @@ 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 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -175,10 +174,10 @@ case $os in - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -223,6 +222,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,20 +252,27 @@ 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 \ -+ | arc \ -+ | 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 \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | 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 \ -@@ -278,30 +290,32 @@ 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 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | 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 | tic54x | tic55x | tic6x | 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 - ;; -@@ -314,8 +328,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 - ;; -@@ -325,6 +338,21 @@ case $basic_machine in - 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. -@@ -339,11 +367,13 @@ 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-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ -@@ -352,12 +382,15 @@ case $basic_machine in - | 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-* \ -+ | 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-* \ -@@ -375,31 +408,34 @@ 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-* \ - | 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-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile-* | tilegx-* \ -+ | 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-*) -@@ -424,7 +460,7 @@ case $basic_machine in - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -507,7 +543,7 @@ case $basic_machine in - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -539,7 +575,7 @@ case $basic_machine in - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -697,7 +733,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 -@@ -755,9 +790,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 -@@ -794,10 +833,18 @@ case $basic_machine in - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -862,10 +909,10 @@ case $basic_machine in - np1) - basic_machine=np1-gould - ;; -- neo-tandem) -+ neo-tandem) - basic_machine=neo-tandem - ;; -- nse-tandem) -+ nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) -@@ -950,9 +997,10 @@ case $basic_machine in - ;; - 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 -@@ -977,7 +1025,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 - ;; -@@ -1046,6 +1098,9 @@ case $basic_machine in - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1102,13 +1157,8 @@ case $basic_machine in - basic_machine=t90-cray - os=-unicos - ;; -- # This must be matched before tile*. -- tilegx*) -- basic_machine=tilegx-unknown -- os=-linux-gnu -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1178,6 +1228,9 @@ case $basic_machine in - 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 -@@ -1275,11 +1328,11 @@ esac - 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|'` -@@ -1303,21 +1356,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* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -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* \ -@@ -1364,7 +1417,7 @@ case $os in - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1413,7 +1466,7 @@ case $os in - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1449,17 +1502,14 @@ case $os in - -aros*) - os=-aros - ;; -- -kaos*) -- os=-kaos -- ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; -- -nacl*) -- ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1482,10 +1532,10 @@ else - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1497,8 +1547,11 @@ case $basic_machine in - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf - ;; - tic54x-*) - os=-coff -@@ -1527,14 +1580,11 @@ 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 - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1561,7 +1611,7 @@ case $basic_machine in - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec)