diff -Nru autotools-dev-20150820.1/ChangeLog autotools-dev-20180224.1~16.04.sav0/ChangeLog --- autotools-dev-20150820.1/ChangeLog 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/ChangeLog 2018-02-24 16:00:57.000000000 +0000 @@ -1,3 +1,602 @@ +2018-02-24 James Clarke + + * config.guess (x86_64:Linux:*:*): Detect x32 ABI. + +2018-02-22 Ben Elliston + + Reported by Nelson H. F. Beebe: + * config.sub (os): Recognise midnightbsd*. + * testsuite/config-sub.data: Add a test case. + +2018-01-26 Henri Menke + + * config.guess: Try to detect musl libc on GNU/Linux systems using + ldd --version. + +2018-01-16 Ben Elliston + + * config.guess: Use double quotes on any remaining unquoted + variables to prevent globbing and word splitting. + +2018-01-16 Ben Elliston + + * config.guess: Change most ${foo} expansions to "$foo" to: + (1) double quote to prevent globbing and word splitting; and + (2) remove extraneous braces. + +2018-01-16 Ben Elliston + + * config.guess: Quote $dummy.c, $dummy.o and $dummy to prevent + globbing and word splitting in the filename. + +2018-01-15 Ben Elliston + + * config.sub: Double quote variables to silence warning SC2086 + (double quote to prevent globbing and word splitting). + +2018-01-14 Ben Elliston + + * config.sub (os): Move -es1800* case above -es*. + * testsuite/config-sub.data: Add several test cases. + +2018-01-14 Ben Elliston + + * config.sub (os): Remove overlapping pattern -svr4*. + +2018-01-14 Ben Elliston + + * config.sub (maybe_os): Remove duplicate pattern -hms*. + * testsuite/config-sub.data: Add a test. + +2018-01-14 Ben Elliston + + * config.sub (maybe_os): Remove duplicate pattern -beos*. + * testsuite/config-sub.data: Add a test. + +2018-01-14 Ben Elliston + + * config.sub (maybe_os): Remove duplicate pattern -haiku*. + (basic_machine): Don't match haiku in the manufacturer field. + * testsuite/config-sub.data: Add a test. + +2018-01-14 Ben Elliston + + * config.sub (maybe_os): Remove duplicate pattern -opened* which + prevents the more specific case matching on line 1427. + * testsuite/config-sub.data: Add a test. + +2018-01-14 Ben Elliston + + * config.sub (maybe_os): Remove first and duplicate -none* + case. This is matched further down. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate case for z8k. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate case for sh. + * testsuite/config-sub.data: Add test cases for sh and sh-elf. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate patterns for sparc, + sparcv8, sparcv9, sparcv9b and sparcv9v. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove cases z8k-*-coff and z80-*-coff as + these are never matched. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate m88k-omron* case. + Found by Shellcheck. + * testsuite/config-sub.data: Add a test case. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove pdp10 case as it is handled above. + Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (basic_machine): Remove first pdp11 case so that the + second, specialised case will match instead. Found by Shellcheck. + * testsuite/config-sub.data: Adjust test case. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Clean up 386BSD. + * testsuite/config-sub.data: Adjust test cases. + +2018-01-13 Ben Elliston + + * testsuite/config-guess.data: Sort. + * testsuite/config-sub.data: Likewise. + +2018-01-13 Ben Elliston + + * config.sub (basic_machine): Remove sparclite-wrs pattern as it + is matched by sparclite-* above. Found by Shellcheck. + * testsuite/config-sub.data: Add test cases. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove -rtmk-nova* pattern as it is + matched by -rtmk* immediately preceding it. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate sh64 case as it is + matched above. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate wasm32 case as it is + matched above. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove duplicate -osfrose* and -osf* + cases as these are matched above by -osf*. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove second and duplicate *-xenix case + as only the first will match. Found by Shellcheck. + * testsuite/config-sub.data: Add test case. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove hppa-next which can never match + due to an earlier pattern. Found by Shellcheck. + * testsuite/config-sub.data: Add test cases. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove i386-vsta which can never match + due to an earlier pattern (but retain vsta). Found by Shellcheck. + * testsuite/config-sub.data: Add test cases. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove second and duplicate -aros* + case. Only the first will match. Found by Shellcheck. + +2018-01-13 Ben Elliston + + * config.sub (maybe_os): Remove second and duplicate *-next + case. Only the first will match. Found by Shellcheck. + +2018-01-11 Randall S. Becker + Ben Elliston + + * config.guess (NSV-*:NONSTOP_KERNEL:*:*): New. + * config.sub (nsv-tandem): New. + * testsuite/config-guess.data: Add a test case. + * testsuite/config-sub.data: Likewise. + +2018-01-01 Ben Elliston + + * config.guess: Update copyright years. + * config.sub: Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + +2017-12-31 Andrew Pinski + + * config.sub (-bme*): New. + * testsuite/config-sub.data: Add a test case. + +2017-12-17 Henry Bent + + * config.guess (mips:OSF1:*:*): Recognise. + * testsuite/config-guess.data: Add a test case. + +2017-11-23 Olivier Hainque + + * config.sub: Map -pikeos to baremetal. + * testsuite/config-sub.data: Add tests for a few pikeos + configuration variants. + +2017-11-07 Ben Elliston + + Thanks to Urs Janßen. + * config.guess (mips:*:*:UMIPS | mips:*:*:RISCos): Fix typo. + +2017-11-07 Ben Elliston + + Reported by Nelson H. F. Beebe: + * config.guess (*:MidnightBSD:*:*): Recognise. + * testsuite/config-guess.data: Add a test case. + +2017-11-05 Ben Elliston + + Also revert -- these parens were there for a reason. :-( + + * config.guess: Remove unnecessary parentheses inside `..` command + substitutions to improve clarity. + +2017-11-04 Ben Elliston + + Revert -- it's too soon to make this change. + + * config.guess: Replace old-style `..` command substitution with + the more modern $(..) form. + * config.sub: Likewise. + +2017-11-04 Ben Elliston + + * config.sub (we32k): Remove duplicate case so that `we32k' + properly canonicalises to `we32k-att-sysv'. + * testsuite/config-sub.data: Update test case. + +2017-11-04 Ben Elliston + + * config.guess: Improve usage text. + * config.sub: Likewise. + +2017-11-03 Ben Elliston + + * config.guess: Replace old-style `..` command substitution with + the more modern $(..) form. + * config.sub: Likewise. + +2017-11-03 Ben Elliston + + * config.guess: Remove unnecessary parentheses inside `..` command + substitutions to improve clarity. + +2017-11-01 Ben Elliston + + * config.guess (i*86:SYSTEM_V:4.*:*): Remove pattern as this is + already matched by i*86:*:4.*:*. + +2017-11-01 Ben Elliston + + * config.guess (romp-ibm:4.4BSD:*): Correct pattern so that it + does not match romp-ibm:BSD:* in the immediately following case. + +2017-11-01 Ben Elliston + + * config.guess (mips:*:*:UMIPS | mips:*:*:RISCos): Use explicit + escaping for \n. + +2017-11-01 Ben Elliston + + * config.guess: Whitespace fixes. + * config.sub: Ditto. + +2017-11-01 Ben Elliston + + * config.sub (maybe_os): Remove redundant dpx2*-bull pattern. + Already matched by dpx2*. + +2017-10-26 Ben Elliston + + * testsuite/config-guess.sh (run_config_guess): Simplify. + * testsuite/config-sub.sh (run_config_sub): Likewise. + +2017-10-26 Ben Elliston + + * testsuite/config-guess.sh: Fix issues identified by Shellcheck. + * testsuite/config-sub.sh: Likewise. + +2017-09-26 Ben Elliston + + * config.guess: Output a note that a C compiler may be needed when + guessing fails on MIPS GNU/Linux systems. + +2017-09-26 Ben Elliston + + * config.guess (Local variables): Use 'write-file-functions + instead of the deprecated 'write-file-hook (as of Emacs 22.1). + * config.sub: Likewise. + +2017-09-16 Paul Eggert + + Prefer https: to http: for gnu.org + In Gnulib, Emacs, etc. we are changing ftp: and http: URLs to + use https:, to help defend against man-in-the-middle attacks. + Propagate these changes upstream to the config scripts. + * config.guess, config.sub: Use https: URLs in diagnostics + and in comments. + +2017-09-15 Ben Elliston + + * testsuite/config-sub.data (i386-windows): New test case. + (x86_64-windows): Likewise. + +2017-09-13 Ben Elliston + + * config.sub (maybe_os): Add x64 alias for x86_64. + +2017-09-12 Ben Elliston + + * config.sub (maybe_os): Remove -windowsnt*. + * config.guess (Alpha\ *:Windows_NT*:*): Remove obsolete case. + (21064:Windows_NT:50:3): Likewise. + (i*:windows32*:*): Likewise. + ([345]86:Windows_95:*, [345]86:Windows_98:*): Likewise. + ([345]86:Windows_NT:*): Likewise. + (8664:Windows_NT:*): Likewise. + (i*:Windows_NT*:* | Pentium*:Windows_NT*:*): Likewise. + (p*:CYGWIN*:*): Likewise. + * testsuite/config-guess.data: Remove relevant test cases. + +2017-09-10 Ben Elliston + + * config.sub: Improve comments. + +2017-08-26 Ben Elliston + + * testsuite/config-guess.data: Sort. + +2017-08-08 Ian Douglas Scott + Ben Elliston + + * config.guess (*:Redox:*:*): New. + * testsuite/config-guess.data: Add a test case. + +2017-07-19 Ben Elliston + + * config.guess: Improve "outdated script" message. + +2017-05-27 Mojca Miklavec + + * config.guess (*:Darwin:*:*): Set UNAME_PROCESSOR to powerpc when + __POWERPC__ is defined (e.g. when building with gcc -arch ppc). + +2017-05-11 Ben Elliston + + * config.guess (NSR-*:NONSTOP_KERNEL:*:*): Match suffix with *. + (NEO-*:NONSTOP_KERNEL:*:*): Likewise. + * testsuite/config-guess.data: Add test cases. + +2017-05-11 Ben Elliston + + Reported by Hugues Lefebvre . + * config.guess (NSX-*:NONSTOP_KERNEL:*:*): Some L-SERIES systems + now have more than one letter in the suffix, so match with *. + * testsuite/config-guess.data: Add a test case. + +2017-04-02 Andrew Jenner + Rask Ingemann Lambertsen + + * config.sub: Add support for 16-bit Intel x86. + +2017-03-21 Pip Cet + + * config.sub: Recognise wasm32. + * testsuite/config-sub.data: Add a test case. + +2017-03-05 Gerald Pfeifer + + * config.guess (*:FreeBSD:*:*): Refactor CPU handling. + Canonicalize i386-*-freebsd* to i586-*-freebsd*. + +2017-02-07 Ben Elliston + + Reported by Hugues Lefebvre . + * config.guess (NSX-?:NONSTOP_KERNEL:*:*): New. + * config.sub (nsx-tandem): New. + * testsuite/config-guess.data: Add a test case. + * testsuite/config-sub.data: Likewise. + +2017-01-01 Ben Elliston + + * config.guess: Update copyright years. + * config.sub: Likewise. + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + +2016-12-28 Ben Elliston + + * Makefile (doc/config.guess.1): Depend on config.guess. + (doc/config.sub.1): Depend on config.sub. + +2016-12-28 Ben Elliston + + * doc/config.guess.1: Regenerate. + * doc/config.sub.1: Likewise. + +2016-12-28 Ben Elliston + + * testsuite/config-guess.data: Align columns. + +2016-12-27 Ben Elliston + + * testsuite/config-sub.data: Align columns. + +2016-12-27 Ben Elliston + + * testsuite/config-guess.data: Sort. + * testsuite/config-sub.data: Likewise. + +2016-12-24 Jeremy Soller + + * config.sub (-redox*): New. + * testsuite/config-sub.data: Add a test case. + +2016-12-16 Dimitar Dimitrov + + * config.sub (pru, pru-*): Force ELF format. + * testsuite/config-sub.data: Update PRU test case. + +2016-11-19 Ben Elliston + + * config.sub (glidix-*): Recognise. + * testsuite/config-sub.data: Add a test case. + +2016-11-04 Ben Elliston + + * testsuite/config-sub.sh: Improve top-of-file comment. + +2016-11-04 Dimitar Dimitrov + + * config.sub (pru, pru-*): New. + * testsuite/config-sub.data: Add test cases. + +2016-11-03 Doug Evans + + * config.sub (-fuchsia*): New. + * testsuite/config-sub.data: Add a test case. + +2016-10-03 Ben Elliston + + * config.guess (mips64el:Linux:*:*): New. + * testsuite/config-guess.data: Add a test case. + +2016-09-11 David Abdurachmanov + + * config.guess (riscv32:Linux:*:*, riscv64:Linux:*:*): New. + * testsuite/config-guess.data: Add riscv32, riscv64. + +2016-09-05 Ed Schouten + + * config.sub (cloudabi*-eabi*): Recognise. + * testsuite/config-sub.data: Add a test case. + +2016-08-28 Ben Elliston + + * testsuite/config-sub.data: Add more retrospective test cases. + +2016-08-25 Alan Modra + + * config.sub: Don't match -le and -little for ppc. + +2016-07-07 Ben Elliston + + * testsuite/config-guess.data: Add ppc64le test case. + +2016-07-03 Ben Elliston + + * testsuite/config-sub.data: Add test cases for all single word + aliases (e.g. foo -> foo-unknown-none). + +2016-06-29 Ben Elliston + + * testsuite/config-guess.sh: Include number of tests in output. + * testsuite/config-sub.sh: Likewise. + +2016-06-20 Ørjan Malde + + * config.sub (-midipix*): New. + * testsuite/config-sub.data: Add test. + +2016-06-14 Jerome Lambourg + + * config.sub (e500v[12], e500v[12]-*): Decode basic machine as a + powerpc alias, and add an "spe" suffix to the OS for e500v1|2 ABI + selection. + * testsuite/config-sub.data: Add tests for e500v[12]-elf, + e500v2-wrs-vxworks, e500v2-vxworksae and e500v2-wrs-linux. + +2016-05-15 Ben Elliston + + * config.guess: Improve help when a system is not recognised. + +2016-05-13 Nick Hudson + + * config.guess (*:NetBSD:*:*): Always use "netbsdelf" for earm. + +2016-05-10 Jakub Sejdak + + * config.sub (-phoenix*): New. + * testsuite/config-sub.data: Add a test case. + +2016-04-02 Ben Elliston + + Silence warning SC2021 from shellcheck. + * config.guess (*:GNU/*:*:*): Use [:upper:] and [:lower:] classes + instead of [A-Z] and [a-z]. Putting [] around character ranges in + tr is a mistake anyway, as it includes square brackets in the + translation. + +2016-04-02 Ben Elliston + + Silence warning SC2116 from shellcheck. + * config.guess (i*86:skyos:*:*): Fix misplaced backquote. + +2016-04-02 Ben Elliston + + Silence warning SC1007 from shellcheck. + * config.guess: Explicitly set CCOPTS to "" not the empty string. + +2016-03-30 Mike Hommey + Ben Elliston + + * config.sub (-ios): New. + * testsuite/config-sub.data: Add a test case (and sort). + +2016-03-24 Luis Kornblueh + + * config.guess (SX-ACE:SUPER-UX:*:*): New. + * testsuite/config-guess.data: Add a test case. + +2016-02-11 Ben Elliston + + * config.guess: Simplify shell code by removing quotes around + fixed strings that contain no expansions. + +2016-02-11 Urs Janßen + + * config.guess (*:LibertyBSD:*:*): Fix sed expression. + +2016-02-03 Riley Baird + + * config.guess (*:LibertyBSD:*:*): New. + * config.sub (-libertybsd*): Likewise. + * testsuite/config-sub.data: Likewise. + +2016-01-01 Ben Elliston + + * config.guess: Update copyright years. + * config.sub: Likewise. + +2015-12-31 Ben Elliston + + * config.guess: Shorten gitweb URLs. + * config.sub: Likewise. + +2015-12-14 Ben Elliston + + * config.guess: Whitespace fixes. + * config.sub: Likewise. + +2015-11-22 Ben Elliston + + * Makefile (manpages): New target. + (doc/config.guess.1): Build man page with help2man. + (doc/config.sub.1): Likewise. + * doc/config.guess.x: Copied from Autoconf tree. + * doc/config.guess.1: Generate. + * doc/config.sub.1: Likewise. + +2015-11-22 Ben Elliston + + * config.sub (usage): Put usage on one line. + +2015-11-19 Ben Elliston + + Reported by Owen Urkov . + * config.guess (amd64:Isilon OneFS:*:*): New. + * config.sub (-onefs*): New. + * testsuite/config-guess.data: Add a test case. + * testsuite/config-sub.data: Likewise. + +2015-10-21 Pavel Janík + + * config.guess (pc:*:*:*): Comment tweak. + +2015-09-14 Ben Elliston + + Reported by Jan Stypka . + * config.guess (k1om:Linux:*:*): New. + * testsuite/config-guess.data: Add a test case. + 2015-08-20 Jonas 'Sortie' Termansen * config.guess (*:Sortix:*:*): New. @@ -285,7 +884,7 @@ * config.guess: Contract the list of copyright years into the range 1992-2013. Remove "(C)" character sequence from copyright - statements. Per http://www.gnu.org/licenses/gpl-howto.html. + statements. Per https://www.gnu.org/licenses/gpl-howto.html. * config.sub: Likewise. 2013-01-23 Sandra Loosemore @@ -405,7 +1004,7 @@ 2012-02-14 Marcus Shawcroft - * config.guess (aarch64:Linux:*:*, aarch64_be:Linux:*:*): New. + * config.guess (aarch64:Linux:*:*, aarch64_be:Linux:*:*): New. * config.sub (aarch64-*, aarch64_be-*): New. * testsuite/config-sub.data: Add aarch64-elf, aarch64-linux aarch64-unknown-elf, aarch64-unknown-linux, aarch64_be-elf, @@ -1545,7 +2144,7 @@ sysctl ((int[]) {CTL_HW, HW_MACHINE_ARCH}, 2, buffer, &bufsize, 0, 0) to return a negative number. Problem reported by Petter Reinholdtsen in: - http://lists.gnu.org/archive/html/bug-gnu-utils/2003-02/msg00201.html + https://lists.gnu.org/archive/html/bug-gnu-utils/2003-02/msg00201.html 2004-07-19 Ben Elliston diff -Nru autotools-dev-20150820.1/config.guess autotools-dev-20180224.1~16.04.sav0/config.guess --- autotools-dev-20150820.1/config.guess 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/config.guess 2018-02-24 16:00:57.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2018-02-24' # 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 @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# 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 @@ -27,7 +27,7 @@ # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # 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 +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -39,7 +39,7 @@ Output the configuration name of the system \`$me' is run on. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2018 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." @@ -107,9 +107,9 @@ dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; + ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; @@ -132,14 +132,14 @@ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "${UNAME_SYSTEM}" in +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 + eval "$set_cc_for_build" + cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc @@ -149,13 +149,20 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + + # If ldd exists, use it to detect musl libc. + if command -v ldd >/dev/null && \ + ldd --version 2>&1 | grep -q ^musl + then + LIBC=musl + fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -169,27 +176,30 @@ # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - /sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || \ + "/sbin/$sysctl" 2>/dev/null || \ + "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` - machine=${arch}${endian}-unknown + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` + machine="${arch}${endian}"-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build + # to ELF recently (or will in the future) and ABI. + case "$UNAME_MACHINE_ARCH" in + earm*) + os=netbsdelf + ;; + arm*|i386|m68k|ns32k|sh3*|sparc|vax) + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -205,10 +215,10 @@ ;; esac # Determine ABI tags. - case "${UNAME_MACHINE_ARCH}" in + case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release @@ -216,42 +226,55 @@ # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in + case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}${abi}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + 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} + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" + exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" + exit ;; + *:MidnightBSD:*:*) + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) - echo ${UNAME_MACHINE}-unknown-sortix + echo "$UNAME_MACHINE"-unknown-sortix exit ;; + *:Redox:*:*) + echo "$UNAME_MACHINE"-unknown-redox + exit ;; + mips:OSF1:*.*) + echo mips-dec-osf1 + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -268,63 +291,54 @@ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; + UNAME_MACHINE=alpha ;; "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; + UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; + UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; + UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; + UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; + UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; + UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; + UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; + UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; + UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; + UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # 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'` + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # 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 - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos + echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos + echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -336,7 +350,7 @@ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} + echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos @@ -363,38 +377,38 @@ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux${UNAME_RELEASE} + echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" + eval "$set_cc_for_build" + SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then - SUN_ARCH="x86_64" + SUN_ARCH=x86_64 fi fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in @@ -403,25 +417,25 @@ ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) - echo m68k-sun-sunos${UNAME_RELEASE} + echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) - echo sparc-sun-sunos${UNAME_RELEASE} + echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} + echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not @@ -432,44 +446,44 @@ # 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} + echo m68k-atari-mint"$UNAME_RELEASE" 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} + echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} + echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} + echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} + echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} + echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} + echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} + echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} + echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ int main (int argc, char *argv[]) { @@ -478,23 +492,23 @@ #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} + echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax @@ -520,17 +534,17 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ + [ "$TARGET_BINARY_INTERFACE"x = x ] then - echo m88k-dg-dgux${UNAME_RELEASE} + echo m88k-dg-dgux"$UNAME_RELEASE" else - echo m88k-dg-dguxbcs${UNAME_RELEASE} + echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else - echo i586-dg-dgux${UNAME_RELEASE} + echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) @@ -547,7 +561,7 @@ echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id @@ -559,14 +573,14 @@ if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include main() @@ -577,7 +591,7 @@ exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else @@ -591,7 +605,7 @@ exit ;; *: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 + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc @@ -600,18 +614,18 @@ IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx @@ -626,28 +640,28 @@ echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + case "$UNAME_MACHINE" in + 9000/31?) HP_ARCH=m68000 ;; + 9000/[34]??) HP_ARCH=m68k ;; 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 + 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 + 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 fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + if [ "$HP_ARCH" = "" ]; then + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include @@ -680,13 +694,13 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] + if [ "$HP_ARCH" = hppa2.0w ] then - eval $set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -697,23 +711,23 @@ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then - HP_ARCH="hppa2.0w" + HP_ARCH=hppa2.0w else - HP_ARCH="hppa64" + HP_ARCH=hppa64 fi fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #include int main () @@ -738,11 +752,11 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) @@ -751,7 +765,7 @@ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) @@ -759,9 +773,9 @@ exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk + echo "$UNAME_MACHINE"-unknown-osf1mk else - echo ${UNAME_MACHINE}-unknown-osf1 + echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) @@ -786,127 +800,109 @@ echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 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/ /_/'` + 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 ;; 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/ /_/'` + 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} + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} + echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case ${UNAME_PROCESSOR} in + case "$UNAME_PROCESSOR" in amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=x86_64 ;; + i386) + UNAME_PROCESSOR=i586 ;; esac + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin + echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) - echo ${UNAME_MACHINE}-pc-mingw64 + echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 + 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 + echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 + echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case "$UNAME_MACHINE" in x86) - echo i586-pc-interix${UNAME_RELEASE} + echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix${UNAME_RELEASE} + echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} + echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - 8664:Windows_NT:*) - echo x86_64-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin + echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`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/[-(].*//'`-${LIBC} + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in @@ -919,61 +915,64 @@ EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="gnulibc1" ; fi - echo ${UNAME_MACHINE}-unknown-linux-${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} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - eval $set_cc_for_build + 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-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) - echo ${UNAME_MACHINE}-axis-linux-${LIBC} + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; + k1om:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + eval "$set_cc_for_build" + sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el @@ -987,64 +986,74 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; + mips64el:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + exit ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-${LIBC} + echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-${LIBC} + echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-${LIBC} + 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-${LIBC} ;; - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; - *) echo hppa-unknown-linux-${LIBC} ;; + 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-${LIBC} + echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-${LIBC} + echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-${LIBC} + echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-${LIBC} + echo powerpcle-unknown-linux-"$LIBC" + exit ;; + riscv32:Linux:*:* | riscv64:Linux:*:*) + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-${LIBC} + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-pc-linux-${LIBC} + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -1058,34 +1067,34 @@ # 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. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx + echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop + echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos + echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable + echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} + echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp + echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + i*86:*:4.*:*) + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) @@ -1095,12 +1104,12 @@ *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1110,9 +1119,9 @@ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else - echo ${UNAME_MACHINE}-pc-sysv32 + echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1120,7 +1129,7 @@ # 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 + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1132,9 +1141,9 @@ exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1154,9 +1163,9 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { 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; } ;; @@ -1165,28 +1174,28 @@ test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} + echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} + echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} + echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} + echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} + echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 @@ -1197,7 +1206,7 @@ *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi @@ -1217,23 +1226,23 @@ exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos + echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} + echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 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 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1252,46 +1261,56 @@ echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} + echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} + echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} + echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} + echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} + echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} + echo sx8r-nec-superux"$UNAME_RELEASE" + exit ;; + SX-ACE:SUPER-UX:*:*) + echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} + echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval $set_cc_for_build + 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 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 + (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 + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc + fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub @@ -1302,27 +1321,33 @@ # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then + if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} + NEO-*:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} + echo nse-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSR-*:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk"$UNAME_RELEASE" exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} + NSV-*:NONSTOP_KERNEL:*:*) + echo nsv-tandem-nsk"$UNAME_RELEASE" + exit ;; + NSX-*:NONSTOP_KERNEL:*:*) + echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux @@ -1331,18 +1356,18 @@ echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = "386"; then + if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi - echo ${UNAME_MACHINE}-unknown-plan9 + echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 @@ -1363,14 +1388,14 @@ 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/[-(].*//'` + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in + case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; @@ -1379,34 +1404,48 @@ echo i386-pc-xenix exit ;; i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos + echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros + echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) - echo ${UNAME_MACHINE}-unknown-esx + echo "$UNAME_MACHINE"-unknown-esx + exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs exit ;; esac +echo "$0: unable to guess system type" >&2 + +case "$UNAME_MACHINE:$UNAME_SYSTEM" in + mips:Linux | mips64:Linux) + # If we got here on MIPS GNU/Linux, output extra information. + cat >&2 <&2 < in order to provide the needed -information to handle your system. +If $0 has already been updated, send the following data and any +information you think might be pertinent to config-patches@gnu.org to +provide the necessary information to handle your system. config.guess timestamp = $timestamp @@ -1425,16 +1464,16 @@ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} +UNAME_MACHINE = "$UNAME_MACHINE" +UNAME_RELEASE = "$UNAME_RELEASE" +UNAME_SYSTEM = "$UNAME_SYSTEM" +UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru autotools-dev-20150820.1/config.sub autotools-dev-20180224.1~16.04.sav0/config.sub --- autotools-dev-20150820.1/config.sub 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/config.sub 2018-02-24 16:00:57.000000000 +0000 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2015-08-20' +timestamp='2018-02-22' # 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 @@ -15,7 +15,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, see . +# 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 @@ -33,7 +33,7 @@ # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases @@ -53,12 +53,11 @@ me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. -Operation modes: +Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit @@ -68,7 +67,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2018 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." @@ -95,7 +94,7 @@ *local*) # First pass through any local machine types. - echo $1 + echo "$1" exit ;; * ) @@ -113,24 +112,24 @@ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + 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/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac @@ -179,44 +178,44 @@ ;; -sco6) os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 @@ -228,10 +227,7 @@ os=-lynxos ;; -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos @@ -264,7 +260,7 @@ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ - | i370 | i860 | i960 | ia64 \ + | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ @@ -300,8 +296,9 @@ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ - | pdp10 | pdp11 | pj | pjl \ + | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ @@ -315,7 +312,7 @@ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ - | we32k \ + | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown @@ -336,7 +333,7 @@ basic_machine=$basic_machine-unknown os=-none ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; ms1) basic_machine=mt-unknown @@ -365,7 +362,7 @@ ;; # Object if more than one company name word. *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. @@ -388,7 +385,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ @@ -429,6 +426,7 @@ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ @@ -445,6 +443,7 @@ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ + | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -458,7 +457,7 @@ # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) - basic_machine=i386-unknown + basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) @@ -492,7 +491,7 @@ basic_machine=x86_64-pc ;; amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl @@ -521,7 +520,7 @@ basic_machine=i386-pc os=-aros ;; - asmjs) + asmjs) basic_machine=asmjs-unknown ;; aux) @@ -537,7 +536,7 @@ os=-linux ;; blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) @@ -545,13 +544,13 @@ os=-cnk ;; c54x-*) - basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) - basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) - basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray @@ -640,10 +639,18 @@ basic_machine=rs6000-bull os=-bosx ;; - dpx2* | dpx2*-bull) + dpx2*) basic_machine=m68k-bull os=-sysv3 ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; ebmon29k) basic_machine=a29k-amd os=-ebmon @@ -733,9 +740,6 @@ hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; - hppa-next) - os=-nextstep3 - ;; hppaosf) basic_machine=hppa1.1-hp os=-osf @@ -748,26 +752,26 @@ basic_machine=i370-ibm ;; i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; - i386-vsta | vsta) + vsta) basic_machine=i386-unknown os=-vsta ;; @@ -786,19 +790,16 @@ os=-sysv ;; leon-*|leon[3-9]-*) - basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; - m88k-omron*) - basic_machine=m88k-omron - ;; magnum | m3230) basic_machine=mips-mips os=-sysv @@ -830,10 +831,10 @@ os=-mint ;; mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k @@ -852,7 +853,7 @@ os=-msdos ;; ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc @@ -894,7 +895,7 @@ basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) @@ -939,6 +940,12 @@ nsr-tandem) basic_machine=nsr-tandem ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf @@ -971,7 +978,7 @@ os=-linux ;; parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) @@ -987,7 +994,7 @@ basic_machine=i386-pc ;; pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc @@ -1002,16 +1009,16 @@ basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould @@ -1021,23 +1028,23 @@ ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) - basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppcle | powerpclittle | ppc-le | powerpc-little) + ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) + ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm @@ -1091,17 +1098,10 @@ sequent) basic_machine=i386-sequent ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; sh5el) basic_machine=sh5le-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) + simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -1120,7 +1120,7 @@ os=-sysv4 ;; strongarm-* | thumb-*) - basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun @@ -1242,6 +1242,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + x64) + basic_machine=x86_64-pc + ;; xbox) basic_machine=i686-pc os=-mingw32 @@ -1250,20 +1253,12 @@ basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) - basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; none) basic_machine=none-none os=-none @@ -1292,10 +1287,6 @@ vax) basic_machine=vax-dec ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; pdp11) basic_machine=pdp11-dec ;; @@ -1305,9 +1296,6 @@ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; cydra) basic_machine=cydra-cydrome ;; @@ -1327,7 +1315,7 @@ # Make sure to match an already-canonicalized machine name. ;; *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac @@ -1335,10 +1323,10 @@ # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1349,8 +1337,8 @@ 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 @@ -1361,18 +1349,19 @@ -solaris) os=-solaris2 ;; - -svr4*) - os=-sysv4 - ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; - # First accept the basic system types. + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. + # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ @@ -1382,24 +1371,26 @@ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -bitrig* | -openbsd* | -solidbsd* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -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* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1416,12 +1407,12 @@ -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) - os=`echo $os | sed -e 's|mac|macos|'` + os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc @@ -1430,10 +1421,10 @@ os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition @@ -1444,12 +1435,6 @@ -wince*) os=-wince ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; -utek*) os=-bsd ;; @@ -1474,7 +1459,7 @@ -nova*) os=-rtmk-nova ;; - -ns2 ) + -ns2) os=-nextstep2 ;; -nsk*) @@ -1496,7 +1481,7 @@ -oss*) os=-sysv3 ;; - -svr4) + -svr4*) os=-sysv4 ;; -svr3) @@ -1511,32 +1496,38 @@ -ose*) os=-ose ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; - -aros*) - os=-aros - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; -nacl*) ;; + -ios) + ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac @@ -1626,12 +1617,12 @@ sparc-* | *-sun) os=-sunos4.1.1 ;; + pru-*) + os=-elf + ;; *-be) os=-beos ;; - *-haiku) - os=-haiku - ;; *-ibm) os=-aix ;; @@ -1671,7 +1662,7 @@ m88k-omron*) os=-luna ;; - *-next ) + *-next) os=-nextstep ;; *-sequent) @@ -1686,9 +1677,6 @@ i370-*) os=-mvs ;; - *-next) - os=-nextstep3 - ;; *-gould) os=-sysv ;; @@ -1798,15 +1786,15 @@ vendor=stratus ;; esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo $basic_machine$os +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru autotools-dev-20150820.1/debian/autotools-dev.NEWS autotools-dev-20180224.1~16.04.sav0/debian/autotools-dev.NEWS --- autotools-dev-20150820.1/debian/autotools-dev.NEWS 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/autotools-dev.NEWS 2018-02-24 16:00:57.000000000 +0000 @@ -13,7 +13,7 @@ This is not going to be a problem at all for any packages that use GNU autoconf/automake, nor it will be a problem for packages - distributed under the GPLv3. Howerver, it may become a problem for + distributed under the GPLv3. However, it may become a problem for the rare packages which do not use GNU autoconf, are distributed with licenses other than the GPLv3, and need config.sub or config.guess. diff -Nru autotools-dev-20150820.1/debian/autotools_dev.pm autotools-dev-20180224.1~16.04.sav0/debian/autotools_dev.pm --- autotools-dev-20150820.1/debian/autotools_dev.pm 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/autotools_dev.pm 2018-02-24 16:00:57.000000000 +0000 @@ -3,6 +3,9 @@ use strict; use Debian::Debhelper::Dh_Lib; + +deprecated_functionality('The autotools-dev sequence is deprecated and replaced by dh in debhelper (>= 9.20160115)', 12); + insert_before("dh_auto_configure", "dh_autotools-dev_updateconfig"); insert_before("dh_clean", "dh_autotools-dev_restoreconfig"); diff -Nru autotools-dev-20150820.1/debian/autotools-dev.README.Debian autotools-dev-20180224.1~16.04.sav0/debian/autotools-dev.README.Debian --- autotools-dev-20150820.1/debian/autotools-dev.README.Debian 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/autotools-dev.README.Debian 2018-02-24 16:00:57.000000000 +0000 @@ -119,8 +119,8 @@ You do *not* have the choice of using this method when libtool is being used in the build. Use the method 1 above, instead. - You can use dh_autotools* to help automate the config.sub and - config.guess update at package build time. + You can use dh_update_autotools_config from debhelper to help automate + the config.sub and config.guess update at package build time. This document contains enough information to properly implement any of the @@ -336,20 +336,19 @@ Using the debhelper helpers: -If you use the "dh" command provided by debhelper mode v7 and newer, -please check the dh_autotools-dev_updateconfig manpage on how to enable -the "autotools_dev" dh module. It will update config.sub and config.guess -for the build. +If you use the "dh" command provided by debhelper at version 9.20160115 +or later, then it will automatically call dh_update_autotools_config to +update config.sub and config.guess for the build. You should also check the dh-autoreconf documentation to automate -retooling on build time, which is preferred over just updating config.sub -and config.guess. Do NOT use dh-autoreconf and dh_autotools-dev_* helpers -at the same time, dh-autoreconf takes care of updating config.sub and -config.guess by itself. - -dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig can be -used directly instead of the "dh" module. Refer to their respective -manpages for examples. +retooling on build time, which is preferred over just updating +config.sub and config.guess. Be careful with mixing the "autoreconf" +and "autotools-dev" dh sequences as they are order sensitive. Please +consider simply removing the "autotools-dev" sequence and rely on +debhelper (>= 9.20160115) built-in functionality. + +dh_update_autotools_config can be used directly without relying on "dh". +Refer to its manpage for more information. CDBS-based packages: diff -Nru autotools-dev-20150820.1/debian/changelog autotools-dev-20180224.1~16.04.sav0/debian/changelog --- autotools-dev-20150820.1/debian/changelog 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/changelog 2019-12-08 03:39:22.000000000 +0000 @@ -1,3 +1,61 @@ +autotools-dev (20180224.1~16.04.sav0) xenial; urgency=medium + + * Backport to Xenial + + -- Rob Savoury Sat, 07 Dec 2019 19:39:22 -0800 + +autotools-dev (20180224.1) unstable; urgency=medium + + * Sync to upstream git 2018-02-24 + [commit bd9626458c30d7faec17d7dfbd85a80617b10007] + + Add detection of x32 ABI for x86_64-*-linux-gnu (closes: #891281) + * debian/control: update vcs-* for salsa.debian.org + * debian/control: bump standards-version to 4.1.3 (no changes needed) + + -- Henrique de Moraes Holschuh Sat, 24 Feb 2018 13:00:57 -0300 + +autotools-dev (20171216.1) unstable; urgency=medium + + * Sync to upstream git 2017-12-16 + [commit f5641da650f5b82367a70983762bbf0e9db0a891] + + Add or fix support for some non-Linux platforms (closes: #884458) + * Acknowledge NMU 20161112.1+nmu1 (closes: #879509), + thanks to: Niels Thykier. + + -- Henrique de Moraes Holschuh Sat, 16 Dec 2017 13:05:22 -0200 + +autotools-dev (20161112.1+nmu1) unstable; urgency=medium + + * Non-maintainer upload with maintainer's permission. + * Deprecate debhelper tools and sequence. They have been + replaced by debhelper (>= 9.20160115). (Closes: #878528) + * Update autotools-dev.README.Debian to reflect the current + status. (Closes: #812521) + + -- Niels Thykier Sun, 22 Oct 2017 12:33:43 +0000 + +autotools-dev (20161112.1) unstable; urgency=medium + + * Sync to upstream git 2016-11-12 + [commit daabcd0839d1fbce591bc54d779773b916e4ec62] + + mips64el:Linux:*:* + + riscv32:Linux:*:*, riscv64:Linux:*:* + + Add or fix support for some non-Linux platforms + * debian/control, compat: switch to debhelper level 9 + + -- Henrique de Moraes Holschuh Sat, 12 Nov 2016 18:18:52 -0200 + +autotools-dev (20160430.1) unstable; urgency=medium + + * Sync to upstram git 2016-04-30 + [commit 706fbe57e39d59f319d338de13b20cecbf7c638c] + + Add support for some non-Linux platforms + + Fixes some issues found by shellcheck + * debian/control: bump standards version (no changes) + * NEWS.Debian: fix typo + + -- Henrique de Moraes Holschuh Sat, 30 Apr 2016 07:52:30 -0300 + autotools-dev (20150820.1) unstable; urgency=medium * Sync to upstream git 2015-08-20 diff -Nru autotools-dev-20150820.1/debian/compat autotools-dev-20180224.1~16.04.sav0/debian/compat --- autotools-dev-20150820.1/debian/compat 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/compat 2018-02-24 16:00:57.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru autotools-dev-20150820.1/debian/control autotools-dev-20180224.1~16.04.sav0/debian/control --- autotools-dev-20150820.1/debian/control 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/control 2018-02-24 16:00:57.000000000 +0000 @@ -2,12 +2,12 @@ Section: devel Priority: optional Maintainer: Henrique de Moraes Holschuh -Build-Depends: debhelper (>> 7) +Build-Depends: debhelper (>> 9) Build-Depends-Indep: perl -Standards-Version: 3.9.5 +Standards-Version: 4.1.3 Homepage: http://savannah.gnu.org/projects/config/ -Vcs-Browser: http://git.debian.org/?p=users/hmh/autotools-dev.git -Vcs-Git: git://git.debian.org/users/hmh/autotools-dev.git +Vcs-Browser: https://salsa.debian.org/hmh/autotools-dev +Vcs-Git: https://salsa.debian.org/hmh/autotools-dev.git Package: autotools-dev Architecture: all diff -Nru autotools-dev-20150820.1/debian/dh_autotools-dev_restoreconfig autotools-dev-20180224.1~16.04.sav0/debian/dh_autotools-dev_restoreconfig --- autotools-dev-20150820.1/debian/dh_autotools-dev_restoreconfig 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/dh_autotools-dev_restoreconfig 2018-02-24 16:00:57.000000000 +0000 @@ -15,6 +15,13 @@ =head1 DESCRIPTION +B: dh_autotools-dev_updateconfig and +dh_autotools-dev_restoreconfig are deprecated and replaced by +L and L from debhelper. +Please replace all uses of dh_autotools-dev_updateconfig with +dh_update_autotools_config and then remove any use of +dh_autotools-dev_restoreconfig. + dh_autotools-dev_restoreconfig restores the original B and B files that have been backed up by dh_autotools-dev_updateconfig under the names B and B. @@ -40,6 +47,8 @@ init(); +deprecated_functionality('dh_autotools-dev_restoreconfig is deprecated; please see dh_autotools-dev_restoreconfig(1) for a replacement', 12); + complex_doit('for c_g in `find . -type f -name config.guess` ; do if test -e "$c_g.dh-orig" ; then mv -f "$c_g.dh-orig" "$c_g" ; fi ; done'); complex_doit('for c_s in `find . -type f -name config.sub` ; do if test -e "$c_s.dh-orig" ; then mv -f "$c_s.dh-orig" "$c_s" ; fi ; done'); complex_doit('find . -type f \( -name config.guess.dh-orig -o -name config.sub.dh-orig \) -delete'); diff -Nru autotools-dev-20150820.1/debian/dh_autotools-dev_updateconfig autotools-dev-20180224.1~16.04.sav0/debian/dh_autotools-dev_updateconfig --- autotools-dev-20150820.1/debian/dh_autotools-dev_updateconfig 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/debian/dh_autotools-dev_updateconfig 2018-02-24 16:00:57.000000000 +0000 @@ -15,6 +15,14 @@ =head1 DESCRIPTION +B: dh_autotools-dev_updateconfig and +dh_autotools-dev_restoreconfig are deprecated and replaced by +L and L from debhelper. +Please replace all uses of dh_autotools-dev_updateconfig with +dh_update_autotools_config and then remove any use of +dh_autotools-dev_restoreconfig. + + dh_autotools-dev_updateconfig replaces all occurances of B and B in the source tree by the up-to-date versions found in the autotools-dev package. The original files are backed up under the names B and @@ -40,6 +48,8 @@ init(); +deprecated_functionality('dh_autotools-dev_updateconfig is deprecated; please see dh_autotools-dev_updateconfig(1) for a replacement', 12); + complex_doit('for c_g in `find -type f -name config.guess` ; do if ! test -e "$c_g.dh-orig" ; then mv -f "$c_g" "$c_g.dh-orig" ; cp -f /usr/share/misc/config.guess "$c_g" ; fi ; done'); complex_doit('for c_s in `find -type f -name config.sub` ; do if ! test -e "$c_s.dh-orig" ; then mv -f "$c_s" "$c_s.dh-orig" ; cp -f /usr/share/misc/config.sub "$c_s" ; fi ; done'); diff -Nru autotools-dev-20150820.1/doc/config.guess.1 autotools-dev-20180224.1~16.04.sav0/doc/config.guess.1 --- autotools-dev-20150820.1/doc/config.guess.1 1970-01-01 00:00:00.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/doc/config.guess.1 2018-02-24 16:00:57.000000000 +0000 @@ -0,0 +1,48 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. +.TH CONFIG.GUESS "1" "January 2018" "config.guess (2018-01-01)" "User Commands" +.SH NAME +config.guess \- guess the build system triplet +.SH SYNOPSIS +.B config.guess +[\fI\,OPTION\/\fR] +.SH DESCRIPTION +The GNU build system distinguishes three types of machines, the +`build' machine on which the compilers are run, the `host' machine +on which the package being built will run, and, exclusively when you +build a compiler, assembler etc., the `target' machine, for which the +compiler being built will produce code. + +This script will guess the type of the `build' machine. +.PP +Output the configuration name of the system `config.guess' is run on. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +print this help, then exit +.TP +\fB\-t\fR, \fB\-\-time\-stamp\fR +print date of last modification, then exit +.TP +\fB\-v\fR, \fB\-\-version\fR +print version number, then exit +.SH "ENVIRONMENT VARIABLES" +config.guess might need to compile and run C code, hence it needs a +compiler for the `build' machine: use the environment variable +`CC_FOR_BUILD' to specify the compiler for the build machine. If +`CC_FOR_BUILD' is not specified, `CC' will be used. Be sure to +specify `CC_FOR_BUILD' is `CC' is a cross-compiler to the `host' +machine. + + CC_FOR_BUILD a native C compiler, defaults to `cc' + CC a native C compiler, CC_FOR_BUILD is preferred +.SH "REPORTING BUGS" +Report bugs and patches to . +.PP +.br +Originally written by Per Bothner. +.br +Copyright 1992\-2018 Free Software Foundation, Inc. +.PP +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -Nru autotools-dev-20150820.1/doc/config.guess.x autotools-dev-20180224.1~16.04.sav0/doc/config.guess.x --- autotools-dev-20150820.1/doc/config.guess.x 1970-01-01 00:00:00.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/doc/config.guess.x 2018-02-24 16:00:57.000000000 +0000 @@ -0,0 +1,22 @@ +[name] +config.guess \- guess the build system triplet + +[Environment variables] +config.guess might need to compile and run C code, hence it needs a +compiler for the `build' machine: use the environment variable +`CC_FOR_BUILD' to specify the compiler for the build machine. If +`CC_FOR_BUILD' is not specified, `CC' will be used. Be sure to +specify `CC_FOR_BUILD' is `CC' is a cross-compiler to the `host' +machine. + + CC_FOR_BUILD a native C compiler, defaults to `cc' + CC a native C compiler, CC_FOR_BUILD is preferred + +[description] +The GNU build system distinguishes three types of machines, the +`build' machine on which the compilers are run, the `host' machine +on which the package being built will run, and, exclusively when you +build a compiler, assembler etc., the `target' machine, for which the +compiler being built will produce code. + +This script will guess the type of the `build' machine. diff -Nru autotools-dev-20150820.1/doc/config.sub.1 autotools-dev-20180224.1~16.04.sav0/doc/config.sub.1 --- autotools-dev-20150820.1/doc/config.sub.1 1970-01-01 00:00:00.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/doc/config.sub.1 2018-02-24 16:00:57.000000000 +0000 @@ -0,0 +1,27 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.3. +.TH CONFIG.SUB "1" "January 2018" "config.sub (2018-01-01)" "User Commands" +.SH NAME +config.sub \- validate and canonicalize a configuration triplet +.SH SYNOPSIS +.B config.sub +[\fI\,OPTION\/\fR] \fI\,CPU-MFR-OPSYS or ALIAS\/\fR +.SH DESCRIPTION +Canonicalize a configuration name. +.SH OPTIONS +.TP +\fB\-h\fR, \fB\-\-help\fR +print this help, then exit +.TP +\fB\-t\fR, \fB\-\-time\-stamp\fR +print date of last modification, then exit +.TP +\fB\-v\fR, \fB\-\-version\fR +print version number, then exit +.SH "REPORTING BUGS" +Report bugs and patches to . +.SH COPYRIGHT +Copyright 1992\-2018 Free Software Foundation, Inc. +.PP +.br +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -Nru autotools-dev-20150820.1/Makefile autotools-dev-20180224.1~16.04.sav0/Makefile --- autotools-dev-20150820.1/Makefile 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/Makefile 2018-02-24 16:00:57.000000000 +0000 @@ -2,6 +2,14 @@ check: check-guess check-sub +manpages: doc/config.guess.1 doc/config.sub.1 + +doc/config.guess.1: config.guess + help2man -N --include=doc/config.guess.x --output=$@ ./config.guess + +doc/config.sub.1: config.sub + help2man -N --name "validate and canonicalize a configuration triplet" --output=$@ ./config.sub + check-guess: cd testsuite && sh config-guess.sh && rm uname diff -Nru autotools-dev-20150820.1/testsuite/config-guess.data autotools-dev-20180224.1~16.04.sav0/testsuite/config-guess.data --- autotools-dev-20150820.1/testsuite/config-guess.data 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/testsuite/config-guess.data 2018-02-24 16:00:57.000000000 +0000 @@ -1,84 +1,98 @@ -2064 ignored z/VM ignored ignored s390-ibm-zvmoe -3 2.3.3 XENIX SysV ignored i386-pc-xenix -8664 1.0 Windows_NT ignored ignored x86_64-pc-mks -aarch64_be ignored Linux ignored ignored aarch64_be-unknown-linux-gnu -aarch64 ignored Linux ignored ignored aarch64-unknown-linux-gnu -amd64 1.5.12(0.116/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin -amd64 6.1.4 NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 -amd64 6.1.5_PATCH NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 -amd64 7.0_BETA NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 -amd64 7.0 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 -amd64 7.0_RC1 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 -arceb ignored Linux ignored ignored arceb-unknown-linux-gnu -arc ignored Linux ignored ignored arc-unknown-linux-gnu -arm ignored riscos ignored ignored arm-unknown-riscos -arm ignored RISCOS ignored ignored arm-unknown-riscos -armv4l ignored riscos ignored ignored arm-unknown-riscos -authenticamd 6.0 Interix ignored ignored x86_64-unknown-interix6.0 -avr32 2.6.15 Linux ignored ignored avr32-unknown-linux-gnu -BePC 1.0 Haiku ignored ignored i586-pc-haiku -crayx1 2.5.20 UNICOS/mp ignored ignored craynv-cray-unicosmp2.5.X -cris 2.6.6 Linux ignored ignored cris-axis-linux-gnu -crisv32 2.6.6 Linux ignored ignored crisv32-axis-linux-gnu -e2k 2.6.32 Linux ignored ignored e2k-unknown-linux-gnu -EM64T 5.2 Interix ignored ignored x86_64-unknown-interix5.2 -evbarm 7.0 NetBSD ignored arm arm-unknown-netbsdelf7.0 -evbarm 7.0 NetBSD ignored armeb armeb-unknown-netbsdelf7.0 -evbarm 7.0 NetBSD ignored earmv6 armv6-unknown-netbsdelf7.0-eabi -evbarm 7.0 NetBSD ignored earmv6eb armv6eb-unknown-netbsdelf7.0-eabi -evbarm 7.0 NetBSD ignored earmv6hf armv6-unknown-netbsdelf7.0-eabihf -evbarm 7.0 NetBSD ignored earmv6hfeb armv6eb-unknown-netbsdelf7.0-eabihf -evbarm 7.0 NetBSD ignored earmv7 armv7-unknown-netbsdelf7.0-eabi -evbarm 7.0 NetBSD ignored earmv7eb armv7eb-unknown-netbsdelf7.0-eabi -evbarm 7.0 NetBSD ignored earmv7hf armv7-unknown-netbsdelf7.0-eabihf -evbarm 7.0 NetBSD ignored earmv7hfeb armv7eb-unknown-netbsdelf7.0-eabihf -frv 2.4.24 Linux ignored ignored frv-unknown-linux-gnu -genuineintel 6.0 Interix ignored ignored x86_64-unknown-interix6.0 -hexagon 1.0 Linux ignored ignored hexagon-unknown-linux-gnu -i386 1.0 MINGW ignored ignored i386-pc-mingw32 -i386 12.1 AROS ignored ignored i386-pc-aros -i386 4.2 LynxOS ignored ignored i386-unknown-lynxos4.2 -i386 ignored VOS ignored ignored i386-stratus-vos -i586 1.0 SolidBSD ignored ignored i586-unknown-solidbsd1.0 -i586 5.0.0 skyos ignored ignored i586-pc-skyos5.0.0 -i586 ignored rdos ignored ignored i586-pc-rdos -i686 1.0.17(0.48/3/2) MSYS_NT-6.0 ignored ignored i686-pc-msys -i686 5.11-686 GNU/kOpenSolaris ignored ignored i686-unknown-kopensolaris5.11-gnu -i686 5.4-1-686 GNU/kFreeBSD ignored ignored i686-unknown-kfreebsd5.4-gnu -i786-pc ignored windows32 ignored ignored i786-pc-mingw32 -i86pc 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 -i86xen 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 -IA64 6.0 Interix ignored ignored ia64-unknown-interix6.0 -macppc 1.0 MirBSD ignored ignored powerpc-unknown-mirbsd1.0 -NEO-1 1.0 NONSTOP_KERNEL ignored ignored neo-tandem-nsk1.0 -NSE-1 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 -NSE-N 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 -NSE-NN 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 -openrisc ignored Linux ignored ignored or1k-unknown-linux-gnu -or1k ignored Linux ignored ignored or1k-unknown-linux-gnu -or1knd ignored Linux ignored ignored or1knd-unknown-linux-gnu -or32 ignored Linux ignored ignored or32-unknown-linux-gnu -padre 2.6.15 Linux ignored ignored sparc-unknown-linux-gnu -pc 1.0 ignored ignored ignored i586-pc-msdosdjgpp -PowerPC 4.2 LynxOS ignored ignored powerpc-unknown-lynxos4.2 -ppc 2.6.9-22 Linux ignored ignored powerpc-unknown-linux-gnu -ppc64 2.6.9-22 Linux ignored ignored powerpc64-unknown-linux-gnu -s390x 5.6 SunOS ignored ignored s390x-ibm-solaris2.6 -SX-7 1.0 SUPER-UX ignored ignored sx7-nec-superux1.0 -SX-8 1.0 SUPER-UX ignored ignored sx8-nec-superux1.0 -SX-8R 1.0 SUPER-UX ignored ignored sx8r-nec-superux1.0 -tile 2.6.36 Linux ignored ignored tile-unknown-linux-gnu -tilegx 2.6.36 Linux ignored ignored tilegx-unknown-linux-gnu -vax 2.6.15 Linux ignored ignored vax-dec-linux-gnu -x86 5.2 Interix ignored ignored i586-pc-interix5.2 -x86 6.0 Interix ignored ignored i586-pc-interix6.0 -x86_64 1.0 Haiku ignored ignored x86_64-unknown-haiku -x86_64 1.0 MINGW64 ignored ignored x86_64-pc-mingw64 -x86_64 1.0 MINGW ignored ignored x86_64-pc-mingw32 -x86_64 1.5.18(0.132/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin -x86_64 2.0.0(0.271/5/3) MSYS_NT-6.1 ignored ignored x86_64-pc-msys -x86_64 2.6.32 Linux ignored ignored x86_64-pc-linux-gnu -x86_64 2.6.32 VMkernel ignored ignored x86_64-unknown-esx -xtensa 2.6.15 Linux ignored ignored xtensa-unknown-linux-gnu -i386 1.0 Sortix ignored ignored i386-unknown-sortix -x86_64 1.0 Sortix ignored ignored x86_64-unknown-sortix +2064 ignored z/VM ignored ignored s390-ibm-zvmoe +3 2.3.3 XENIX SysV ignored i386-pc-xenix +aarch64_be ignored Linux ignored ignored aarch64_be-unknown-linux-gnu +aarch64 ignored Linux ignored ignored aarch64-unknown-linux-gnu +amd64 1.5.12(0.116/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin +amd64 6.1.4 NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 +amd64 6.1.5_PATCH NetBSD ignored x86_64 x86_64-unknown-netbsd6.1 +amd64 7.0_BETA NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 +amd64 7.0 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 +amd64 7.0_RC1 NetBSD ignored x86_64 x86_64-unknown-netbsd7.0 +amd64 7.2.1 Isilon\ OneFS ignored ignored x86_64-unknown-onefs +arceb ignored Linux ignored ignored arceb-unknown-linux-gnu +arc ignored Linux ignored ignored arc-unknown-linux-gnu +arm ignored riscos ignored ignored arm-unknown-riscos +arm ignored RISCOS ignored ignored arm-unknown-riscos +armv4l ignored riscos ignored ignored arm-unknown-riscos +authenticamd 6.0 Interix ignored ignored x86_64-unknown-interix6.0 +avr32 2.6.15 Linux ignored ignored avr32-unknown-linux-gnu +BePC 1.0 Haiku ignored ignored i586-pc-haiku +crayx1 2.5.20 UNICOS/mp ignored ignored craynv-cray-unicosmp2.5.X +cris 2.6.6 Linux ignored ignored cris-axis-linux-gnu +crisv32 2.6.6 Linux ignored ignored crisv32-axis-linux-gnu +e2k 2.6.32 Linux ignored ignored e2k-unknown-linux-gnu +EM64T 5.2 Interix ignored ignored x86_64-unknown-interix5.2 +evbarm 7.0 NetBSD ignored arm arm-unknown-netbsdelf7.0 +evbarm 7.0 NetBSD ignored armeb armeb-unknown-netbsdelf7.0 +evbarm 7.0 NetBSD ignored earmv6 armv6-unknown-netbsdelf7.0-eabi +evbarm 7.0 NetBSD ignored earmv6eb armv6eb-unknown-netbsdelf7.0-eabi +evbarm 7.0 NetBSD ignored earmv6hf armv6-unknown-netbsdelf7.0-eabihf +evbarm 7.0 NetBSD ignored earmv6hfeb armv6eb-unknown-netbsdelf7.0-eabihf +evbarm 7.0 NetBSD ignored earmv7 armv7-unknown-netbsdelf7.0-eabi +evbarm 7.0 NetBSD ignored earmv7eb armv7eb-unknown-netbsdelf7.0-eabi +evbarm 7.0 NetBSD ignored earmv7hf armv7-unknown-netbsdelf7.0-eabihf +evbarm 7.0 NetBSD ignored earmv7hfeb armv7eb-unknown-netbsdelf7.0-eabihf +frv 2.4.24 Linux ignored ignored frv-unknown-linux-gnu +genuineintel 6.0 Interix ignored ignored x86_64-unknown-interix6.0 +hexagon 1.0 Linux ignored ignored hexagon-unknown-linux-gnu +i386 1.0 MINGW ignored ignored i386-pc-mingw32 +i386 1.0 Sortix ignored ignored i386-unknown-sortix +i386 12.1 AROS ignored ignored i386-pc-aros +i386 4.2 LynxOS ignored ignored i386-unknown-lynxos4.2 +i386 ignored VOS ignored ignored i386-stratus-vos +i586 1.0 SolidBSD ignored ignored i586-unknown-solidbsd1.0 +i586 5.0.0 skyos ignored ignored i586-pc-skyos5.0.0 +i586 ignored rdos ignored ignored i586-pc-rdos +i686 1.0.17(0.48/3/2) MSYS_NT-6.0 ignored ignored i686-pc-msys +i686 1.0 MidnightBSD ignored ignored i686-unknown-midnightbsd1.0 +i686 5.11-686 GNU/kOpenSolaris ignored ignored i686-unknown-kopensolaris5.11-gnu +i686 5.4-1-686 GNU/kFreeBSD ignored ignored i686-unknown-kfreebsd5.4-gnu +i86pc 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 +i86xen 5.0 AuroraUX ignored ignored i386-pc-auroraux5.0 +IA64 6.0 Interix ignored ignored ia64-unknown-interix6.0 +k1om 2.6.38 Linux ignored ignored k1om-unknown-linux-gnu +macppc 1.0 MirBSD ignored ignored powerpc-unknown-mirbsd1.0 +mips 1.0 OSF1 ignored ignored mips-dec-osf1 +mips64el 2.6.2 Linux ignored ignored mips64el-unknown-linux-gnu +NEO-1 1.0 NONSTOP_KERNEL ignored ignored neo-tandem-nsk1.0 +NEO-12 1.0 NONSTOP_KERNEL ignored ignored neo-tandem-nsk1.0 +NSE-1 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSE-12 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSE-N 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSE-NN 1.0 NONSTOP_KERNEL ignored ignored nse-tandem-nsk1.0 +NSR-12 1.0 NONSTOP_KERNEL ignored ignored nsr-tandem-nsk1.0 +NSV-1 1.0 NONSTOP_KERNEL ignored ignored nsv-tandem-nsk1.0 +NSX-HA L16 NONSTOP_KERNEL 05 ignored nsx-tandem-nskL16 +NSX-H L16 NONSTOP_KERNEL 05 ignored nsx-tandem-nskL16 +openrisc ignored Linux ignored ignored or1k-unknown-linux-gnu +or1k ignored Linux ignored ignored or1k-unknown-linux-gnu +or1knd ignored Linux ignored ignored or1knd-unknown-linux-gnu +or32 ignored Linux ignored ignored or32-unknown-linux-gnu +padre 2.6.15 Linux ignored ignored sparc-unknown-linux-gnu +pc 1.0 ignored ignored ignored i586-pc-msdosdjgpp +PowerPC 4.2 LynxOS ignored ignored powerpc-unknown-lynxos4.2 +ppc 2.6.9-22 Linux ignored ignored powerpc-unknown-linux-gnu +ppc64 2.6.9-22 Linux ignored ignored powerpc64-unknown-linux-gnu +ppc64le 3.1.0 Linux ignored ignored powerpc64le-unknown-linux-gnu +riscv32 ignored Linux ignored ignored riscv32-unknown-linux-gnu +riscv64 ignored Linux ignored ignored riscv64-unknown-linux-gnu +s390x 5.6 SunOS ignored ignored s390x-ibm-solaris2.6 +SX-7 1.0 SUPER-UX ignored ignored sx7-nec-superux1.0 +SX-8 1.0 SUPER-UX ignored ignored sx8-nec-superux1.0 +SX-8R 1.0 SUPER-UX ignored ignored sx8r-nec-superux1.0 +SX-ACE 1.0 SUPER-UX ignored ignored sxace-nec-superux1.0 +tile 2.6.36 Linux ignored ignored tile-unknown-linux-gnu +tilegx 2.6.36 Linux ignored ignored tilegx-unknown-linux-gnu +vax 2.6.15 Linux ignored ignored vax-dec-linux-gnu +x86 5.2 Interix ignored ignored i586-pc-interix5.2 +x86 6.0 Interix ignored ignored i586-pc-interix6.0 +x86_64 1.0 Haiku ignored ignored x86_64-unknown-haiku +x86_64 1.0 MINGW64 ignored ignored x86_64-pc-mingw64 +x86_64 1.0 MINGW ignored ignored x86_64-pc-mingw32 +x86_64 1.0 Redox ignored ignored x86_64-unknown-redox +x86_64 1.0 Sortix ignored ignored x86_64-unknown-sortix +x86_64 1.5.18(0.132/4/2) CYGWIN_NT-5.2 ignored ignored x86_64-unknown-cygwin +x86_64 2.0.0(0.271/5/3) MSYS_NT-6.1 ignored ignored x86_64-pc-msys +x86_64 2.6.32 Linux ignored ignored x86_64-pc-linux-gnu +x86_64 2.6.32 VMkernel ignored ignored x86_64-unknown-esx +xtensa 2.6.15 Linux ignored ignored xtensa-unknown-linux-gnu diff -Nru autotools-dev-20150820.1/testsuite/config-guess.sh autotools-dev-20180224.1~16.04.sav0/testsuite/config-guess.sh --- autotools-dev-20150820.1/testsuite/config-guess.sh 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/testsuite/config-guess.sh 2018-02-24 16:00:57.000000000 +0000 @@ -8,9 +8,9 @@ # the simulated uname(1) output and the expected GNU system triplet. verbose=false -PATH=`pwd`:$PATH +PATH=$(pwd):$PATH -run_config_guess () +run_config_guess() { rc=0 while read machine release system version processor triplet ; do @@ -29,13 +29,13 @@ [ \$1 = -p ] && echo "@PROCESSOR@" && exit 0 EOF chmod +x uname - output=`sh ../config.guess 2>/dev/null` + output=$(../config.guess 2>/dev/null) if test $? != 0 ; then echo "FAIL: unable to guess $machine:$release:$system:$version" rc=1 continue fi - if test $output != $triplet ; then + if test "$output" != "$triplet" ; then echo "FAIL: $output (expected $triplet)" rc=1 continue @@ -46,7 +46,8 @@ } if run_config_guess < config-guess.data ; then - $verbose || echo "PASS: config.guess checks" + numtests=$(wc -l config-guess.data | cut -d' ' -f1) + $verbose || echo "PASS: config.guess checks ($numtests tests)" else echo "Unexpected failures." exit 1 diff -Nru autotools-dev-20150820.1/testsuite/config-sub.data autotools-dev-20180224.1~16.04.sav0/testsuite/config-sub.data --- autotools-dev-20150820.1/testsuite/config-sub.data 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/testsuite/config-sub.data 2018-02-24 16:00:57.000000000 +0000 @@ -1,339 +1,568 @@ -aarch64_be-elf aarch64_be-unknown-elf -aarch64_be-linux aarch64_be-unknown-linux-gnu -aarch64_be-unknown-elf aarch64_be-unknown-elf -aarch64_be-unknown-linux aarch64_be-unknown-linux-gnu -aarch64-elf aarch64-unknown-elf -aarch64-linux aarch64-unknown-linux-gnu -aarch64-unknown-elf aarch64-unknown-elf -aarch64-unknown-linux aarch64-unknown-linux-gnu -amd64-cygwin x86_64-pc-cygwin -amd64-kfreebsd5.4-gnu x86_64-pc-kfreebsd5.4-gnu -amd64-unknown-freebsd5.2 x86_64-unknown-freebsd5.2 -arceb-linux arceb-unknown-linux-gnu -arc-linux arc-unknown-linux-gnu -arm-cegcc arm-unknown-cegcc -arm-coff arm-unknown-coff -armeb-unknown-netbsdelf7.0 armeb-unknown-netbsdelf7.0 -arm-elf arm-unknown-elf -arm-linux-androideabi arm-unknown-linux-androideabi -arm-mingw32ce arm-unknown-mingw32ce -arm-riscos arm-unknown-riscos -arm-tirtos arm-unknown-tirtos -arm-unknown-netbsdelf7.0 arm-unknown-netbsdelf7.0 -arm-unknown-riscos arm-unknown-riscos -armv6eb-unknown-netbsdelf7.0 armv6eb-unknown-netbsdelf7.0 -armv6eb-unknown-netbsdelf7.0-eabi armv6eb-unknown-netbsdelf7.0-eabi -armv6eb-unknown-netbsdelf7.0-eabihf armv6eb-unknown-netbsdelf7.0-eabihf -armv6-linux-gnu armv6-unknown-linux-gnu -armv6-unknown-netbsdelf7.0 armv6-unknown-netbsdelf7.0 -armv6-unknown-netbsdelf7.0-eabi armv6-unknown-netbsdelf7.0-eabi -armv6-unknown-netbsdelf7.0-eabihf armv6-unknown-netbsdelf7.0-eabihf -armv7a-linux-gnueabi armv7a-unknown-linux-gnueabi -armv7eb-unknown-netbsdelf7.0 armv7eb-unknown-netbsdelf7.0 -armv7eb-unknown-netbsdelf7.0-eabi armv7eb-unknown-netbsdelf7.0-eabi -armv7eb-unknown-netbsdelf7.0-eabihf armv7eb-unknown-netbsdelf7.0-eabihf -armv7-unknown-netbsdelf7.0 armv7-unknown-netbsdelf7.0 -armv7-unknown-netbsdelf7.0-eabi armv7-unknown-netbsdelf7.0-eabi -armv7-unknown-netbsdelf7.0-eabihf armv7-unknown-netbsdelf7.0-eabihf -armv8b-linux-gnueabi armv8b-unknown-linux-gnueabi -aros i386-pc-aros -asmjs asmjs-unknown-none -avr32 avr32-unknown-none -avr32-linux avr32-unknown-linux-gnu -ba-elf ba-unknown-elf -ba-linux ba-unknown-linux-gnu -be32-none be32-unknown-none -be64-none be64-unknown-none -bfin bfin-unknown-none -bfin-elf bfin-unknown-elf -blackfin bfin-unknown-linux-gnu -c54x-coff tic54x-unknown-coff -c54x-none-coff tic54x-none-coff -c54x tic54x-unknown-coff -c54x-unknown-coff tic54x-unknown-coff -c55x-coff tic55x-unknown-coff -c55x-none-coff tic55x-none-coff -c55x tic55x-unknown-coff -c55x-unknown-coff tic55x-unknown-coff -c6x-coff tic6x-unknown-coff -c6x-elf tic6x-unknown-elf -c6x-none-coff tic6x-none-coff -c6x-none-elf tic6x-none-elf -c6x tic6x-unknown-coff -c6x-uclinux tic6x-unknown-uclinux -c6x-unknown-coff tic6x-unknown-coff -c6x-unknown-elf tic6x-unknown-elf -c8051 c8051-unknown-elf -c8051-elf c8051-unknown-elf -cegcc arm-unknown-cegcc -cr16-elf cr16-unknown-elf -cr16-random-elf cr16-unknown-elf -cris-linux cris-axis-linux-gnu -crisv32-linux crisv32-axis-linux-gnu -dicos i686-pc-dicos -djgpp i586-pc-msdosdjgpp -e2k-linux e2k-unknown-linux-gnu -epiphany-elf epiphany-unknown-elf -epiphany epiphany-unknown-none -fido-elf fido-unknown-elf -fido fido-unknown-none -frv-linux frv-unknown-linux-gnu -ft32-elf ft32-unknown-elf -hexagon hexagon-unknown-elf -hexagon-linux hexagon-unknown-linux-gnu -i386-aros i386-pc-aros -i386-bitrig i386-pc-bitrig -i386-cloudabi i386-pc-cloudabi -i386-drops1.0 i386-pc-drops1.0 -i386-elf i386-pc-elf -i386-es i386-pc-es -i386-freebsd i386-pc-freebsd -i386-haiku i386-pc-haiku -i386-linux i386-pc-linux-gnu -i386-linux-musl i386-pc-linux-musl -i386-linux-newlib i386-pc-linux-newlib -i386-mingw32 i386-pc-mingw32 -i386-msys i386-pc-msys -i386-netbsd i386-pc-netbsd -i386-openbsd i386-pc-openbsd -i386-os2 i386-pc-os2 -i386-pc-nacl i386-pc-nacl -i386-pc-sco5v6 i386-pc-sco5v6 -i386-pc-sco6 i386-pc-sco5v6 -i386-plan9 i386-pc-plan9 -i386-solidbsd i386-pc-solidbsd -i386-sortix i386-pc-sortix -i486-elf i486-pc-elf -i586-auroraux5.0 i586-pc-auroraux5.0 -i586-auroraux i586-pc-auroraux -i586-elf i586-pc-elf -i586-rdos i586-pc-rdos -i586-skyos i586-pc-skyos -i686-android-linux i686-unknown-linux-android -i686-dicos i686-pc-dicos -i686-elf i686-pc-elf -i686-ericsson-dicos i686-ericsson-dicos -i686-kopensolaris5.11-gnu i686-pc-kopensolaris5.11-gnu -i786-elf i786-pc-elf -ibm i370-ibm-aix -k1om k1om-unknown-none -k1om-linux k1om-unknown-linux-gnu -le32-nacl le32-unknown-nacl -le64-none le64-unknown-none -leon3-elf sparc-leon3-elf -leon3-vxworks sparc-leon3-vxworks -leon-elf sparc-leon-elf -leon-wrs-vxworks sparc-leon-vxworks -lm32-elf lm32-unknown-elf -lm32 lm32-unknown-none -m32c-elf m32c-unknown-elf -m32c m32c-unknown-none -m68knommu m68k-unknown-linux-gnu -maxq-elf maxq-unknown-elf -maxq maxq-unknown-none -mb-elf mb-unknown-elf -mep-elf mep-unknown-elf -mep mep-unknown-elf -metag-linux metag-unknown-linux-gnu -metag metag-unknown-none -microblazeel-elf microblazeel-unknown-elf -microblaze-elf microblaze-unknown-elf -microblazeel-linux microblazeel-unknown-linux-gnu -microblazeel microblazeel-unknown-none -microblaze-linux microblaze-unknown-linux-gnu -microblaze microblaze-unknown-none -mingw32ce arm-unknown-mingw32ce -mingw32 i686-pc-mingw32 -mingw64 x86_64-pc-mingw64 -mips64octeonel-elf mips64octeonel-unknown-elf -mips64octeon-elf mips64octeon-unknown-elf -mips64octeonel mips64octeonel-unknown-elf -mips64octeon mips64octeon-unknown-elf -mips64r5900el-elf mips64r5900el-unknown-elf -mips64r5900-elf mips64r5900-unknown-elf -mips64r5900el mips64r5900el-unknown-elf -mips64r5900 mips64r5900-unknown-elf -mips64vr5900el-elf mips64vr5900el-unknown-elf -mips64vr5900-elf mips64vr5900-unknown-elf -mips64vr5900el mips64vr5900el-unknown-elf -mips64vr5900 mips64vr5900-unknown-elf -mipsisa32r6el-elf mipsisa32r6el-unknown-elf -mipsisa32r6-elf mipsisa32r6-unknown-elf -mipsisa64r6el-elf mipsisa64r6el-unknown-elf -mipsisa64r6-elf mipsisa64r6-unknown-elf -mipsr5900el mipsr5900el-unknown-elf -mipsr5900 mipsr5900-unknown-elf -mips-sde-elf mips-sde-elf -mmix-elf mmix-knuth-elf -mmix mmix-knuth-mmixware -moxiebox moxie-unknown-moxiebox -moxie-elf moxie-unknown-elf -ms1-elf mt-unknown-elf -ms1 mt-unknown-none -msys i686-pc-msys -mt-elf mt-unknown-elf -mt mt-unknown-none -nacl le32-unknown-nacl -nds32-elf nds32-unknown-elf -nds32le-elf nds32le-unknown-elf -nds32le nds32le-unknown-none -nds32 nds32-unknown-none -nios2eb-elf nios2eb-unknown-elf -nios2eb nios2eb-unknown-none -nios2el-elf nios2el-unknown-elf -nios2-elf nios2-unknown-elf -nios2el nios2el-unknown-none -nios2 nios2-unknown-none -nios-elf nios-unknown-elf -nios nios-unknown-none -nvptx nvptx-unknown-none -open8-elf open8-unknown-elf -open8 open8-unknown-none -openrisc-linux or32-unknown-linux-gnu -or1k64-unknown-linux or1k64-unknown-linux-gnu -or1k-company-elf or1k-company-elf -or1k-company-linux or1k-company-linux-gnu -or1k-elf or1k-unknown-elf -or1k-linux-gnu or1k-unknown-linux-gnu -or1k-linux or1k-unknown-linux-gnu -or1k-linux-uclibc or1k-unknown-linux-uclibc -or1knd-company-elf or1knd-company-elf -or1knd-company-linux or1knd-company-linux-gnu -or1knd-elf or1knd-unknown-elf -or1knd-linux-gnu or1knd-unknown-linux-gnu -or1knd-linux or1knd-unknown-linux-gnu -or1knd-linux-uclibc or1knd-unknown-linux-uclibc -or1knd or1knd-unknown-none -or1k or1k-unknown-none -or32-linux or32-unknown-linux-gnu -os400 powerpc-ibm-os400 -parisc hppa-unknown-linux-gnu -pc98-freebsd i386-pc-freebsd -picochip picochip-unknown-none -powerpc-bluegene powerpc-ibm-cnk -powerpc-cnk powerpc-ibm-cnk -powerpc-elf-lynxos5 powerpc-elf-lynxos5 -powerpc-elf-lynxos powerpc-elf-lynxos -powerpc-haiku powerpc-unknown-haiku -powerpc-xcoff-lynxos178 powerpc-xcoff-lynxos178 -ppcbe-elf powerpc-unknown-elf -ppcbe-none-elf powerpc-none-elf -ppcbe powerpc-unknown-none -ppc-elf powerpc-unknown-elf -ppcle-elf powerpcle-unknown-elf -ppcle-none-elf powerpcle-none-elf -ppcle powerpcle-unknown-none -ppc-none-elf powerpc-none-elf -ppc powerpc-unknown-none -rdos32 i386-pc-rdos -rdos64 x86_64-pc-rdos -rdos x86_64-pc-rdos -riscv32-company-elf riscv32-company-elf -riscv32-elf riscv32-unknown-elf -riscv32-linux riscv32-unknown-linux-gnu -riscv64-company-elf riscv64-company-elf -riscv64-elf riscv64-unknown-elf -riscv64-linux riscv64-unknown-linux-gnu -rl78-linux rl78-unknown-linux-gnu -rl78 rl78-unknown-none -rx-linux rx-unknown-linux-gnu -rx rx-unknown-none -s390-ibm-zvmoe s390-ibm-zvmoe -score-elf score-unknown-elf -score score-unknown-elf -sde-elf mipsisa32-sde-elf -sh1-elf sh1-unknown-elf -sh1le-elf sh1le-unknown-elf -sh2aeb-elf sh2aeb-unknown-elf -sh2aeb sh2aeb-unknown-none -sh2a-elf sh2a-unknown-elf -sh2eb-elf sh2eb-unknown-elf -sh2e-elf sh2e-unknown-elf -sh2-elf sh2-unknown-elf -sh2le-elf sh2le-unknown-elf -sh3eb-elf sh3eb-unknown-elf -sh3e-elf sh3e-unknown-elf -sh3ele-elf sh3ele-unknown-elf -sh3-elf sh3-unknown-elf -sh3le-elf sh3le-unknown-elf -sh4aeb-elf sh4aeb-unknown-elf -sh4aeb sh4aeb-unknown-none -sh4a-elf sh4a-unknown-elf -sh4eb-elf sh4eb-unknown-elf -sh4-elf sh4-unknown-elf -sh4le-elf sh4le-unknown-elf -sh5el-elf sh5le-unknown-elf -sh5el-netbsd sh5le-unknown-netbsd -sh64-elf sh64-unknown-elf -sh64 sh64-unknown-none -shbe-elf shbe-unknown-elf -sheb-elf sheb-unknown-elf -sh-elf sh-unknown-elf -shle-elf shle-unknown-elf -sh-toppers sh-unknown-toppers -sparc64b-linux sparc64b-unknown-linux-gnu -sparc64-linux sparc64-unknown-linux-gnu -sparc64v-elf sparc64v-unknown-elf -sparc64v-solaris2.9 sparc64v-unknown-solaris2.9 -sparc-haiku sparc-unknown-haiku -sparcv9v-elf sparcv9v-unknown-elf -sparcv9v-solaris2.9 sparcv9v-unknown-solaris2.9 -spu-elf spu-unknown-elf -spu-linux spu-unknown-linux-gnu -spu spu-unknown-elf -strongarm arm-unknown-none -strongarm-none-elf arm-none-elf -sun3 m68k-sun-sunos4.1.1 -sun4 sparc-sun-sunos4.1.1 -thumb arm-unknown-none -thumb-none-elf arm-none-elf -tic54x-coff tic54x-unknown-coff -tic54x-none-coff tic54x-none-coff -tic54x tic54x-unknown-coff -tic54x-unknown-coff tic54x-unknown-coff -tic55x-coff tic55x-unknown-coff -tic55x-none-coff tic55x-none-coff -tic55x tic55x-unknown-coff -tic55x-unknown-coff tic55x-unknown-coff -tic6x-coff tic6x-unknown-coff -tic6x-elf tic6x-unknown-elf -tic6x-none-coff tic6x-none-coff -tic6x-none-elf tic6x-none-elf -tic6x tic6x-unknown-coff -tic6x-uclinux tic6x-unknown-uclinux -tic6x-unknown-coff tic6x-unknown-coff -tic6x-unknown-elf tic6x-unknown-elf -tile64 tile64-unknown-linux-gnu -tilegx-linux tilegx-unknown-linux-gnu -tilegx tilegx-unknown-linux-gnu -tilegx-unknown-linux tilegx-unknown-linux-gnu -tile-linux tile-unknown-linux-gnu -tile tile-unknown-linux-gnu -tile-unknown-linux tile-unknown-linux-gnu -ubicom32-elf ubicom32-unknown-elf -ubicom32 ubicom32-unknown-none -v850e1-elf v850e1-unknown-elf -v850e2-elf v850e2-unknown-elf -v850e2v3-elf v850e2v3-unknown-elf -v850e-elf v850e-unknown-elf -v850-elf v850-unknown-elf -v850es-elf v850es-unknown-elf -visium-elf visium-unknown-elf -x86_64-cygwin x86_64-pc-cygwin -x86_64-dicos x86_64-pc-dicos -x86_64-ericsson-dicos x86_64-ericsson-dicos -x86_64-sortix x86_64-pc-sortix -xbox i686-pc-mingw32 -xc16x-elf xc16x-unknown-elf -xc16x xc16x-unknown-none -xgate xgate-unknown-none -xscale arm-unknown-none -xscaleeb armeb-unknown-none -xscaleeb-none-elf armeb-none-elf -xscaleel armel-unknown-none -xscaleel-none-elf armel-none-elf -xscale-none-elf arm-none-elf -xtensa_dc232b-linux xtensa_dc232b-unknown-linux-gnu -xtensa-elf xtensa-unknown-elf -xtensa-linux xtensa-unknown-linux-gnu -z80-coff z80-unknown-coff +1750a 1750a-unknown-none +386bsd i386-pc-bsd +580 580-unknown-none +a29k a29k-unknown-none +a29khif a29k-amd-udi +aarch64 aarch64-unknown-none +aarch64_be aarch64_be-unknown-none +aarch64_be-bme aarch64_be-unknown-bme +aarch64_be-elf aarch64_be-unknown-elf +aarch64_be-linux aarch64_be-unknown-linux-gnu +aarch64_be-unknown-elf aarch64_be-unknown-elf +aarch64_be-unknown-linux aarch64_be-unknown-linux-gnu +aarch64-bme aarch64-unknown-bme +aarch64-elf aarch64-unknown-elf +aarch64-linux aarch64-unknown-linux-gnu +aarch64-unknown-elf aarch64-unknown-elf +aarch64-unknown-linux aarch64-unknown-linux-gnu +abacus abacus-unknown-none +adobe68k m68010-adobe-scout +alliant fx80-alliant-none +alpha64 alpha64-unknown-none +alpha64ev4 alpha64ev4-unknown-none +alpha64ev56 alpha64ev56-unknown-none +alpha64ev67 alpha64ev67-unknown-none +alpha64pca56 alpha64pca56-unknown-none +alpha alpha-unknown-none +alphaev4 alphaev4-unknown-none +alphaev56 alphaev56-unknown-none +alphaev67 alphaev67-unknown-none +alphapca56 alphapca56-unknown-none +altos3068 m68k-altos-sysv +altos m68k-altos-sysv +am33_2.0 am33_2.0-unknown-none +amd64-cygwin x86_64-pc-cygwin +amd64-kfreebsd5.4-gnu x86_64-pc-kfreebsd5.4-gnu +amd64-midnightbsd0.7 x86_64-pc-midnightbsd0.7 +amd64-onefs x86_64-pc-onefs +amd64-unknown-freebsd5.2 x86_64-unknown-freebsd5.2 +amd64 x86_64-pc-none +amdahl 580-amdahl-sysv +amiga m68k-unknown-none +arc arc-unknown-none +arceb arceb-unknown-none +arceb-linux arceb-unknown-linux-gnu +arc-linux arc-unknown-linux-gnu +arm arm-unknown-none +armbe armbe-unknown-none +arm-cegcc arm-unknown-cegcc +arm-coff arm-unknown-coff +armeb-unknown-netbsdelf7.0 armeb-unknown-netbsdelf7.0 +armel armel-unknown-none +arm-elf arm-unknown-elf +armle armle-unknown-none +arm-linux-androideabi arm-unknown-linux-androideabi +arm-mingw32ce arm-unknown-mingw32ce +arm-pikeos arm-unknown-eabi +arm-riscos arm-unknown-riscos +arm-sysgo-pikeos arm-sysgo-eabi +arm-tirtos arm-unknown-tirtos +arm-unknown-netbsdelf7.0 arm-unknown-netbsdelf7.0 +arm-unknown-riscos arm-unknown-riscos +armv2 armv2-unknown-none +armv3l armv3l-unknown-none +armv6-cloudabi-eabihf armv6-unknown-cloudabi-eabihf +armv6eb-unknown-netbsdelf7.0 armv6eb-unknown-netbsdelf7.0 +armv6eb-unknown-netbsdelf7.0-eabi armv6eb-unknown-netbsdelf7.0-eabi +armv6eb-unknown-netbsdelf7.0-eabihf armv6eb-unknown-netbsdelf7.0-eabihf +armv6-linux-gnu armv6-unknown-linux-gnu +armv6-unknown-netbsdelf7.0 armv6-unknown-netbsdelf7.0 +armv6-unknown-netbsdelf7.0-eabi armv6-unknown-netbsdelf7.0-eabi +armv6-unknown-netbsdelf7.0-eabihf armv6-unknown-netbsdelf7.0-eabihf +armv7a armv7a-unknown-none +armv7a-linux-gnueabi armv7a-unknown-linux-gnueabi +armv7-apple-ios armv7-apple-ios +armv7eb-unknown-netbsdelf7.0 armv7eb-unknown-netbsdelf7.0 +armv7eb-unknown-netbsdelf7.0-eabi armv7eb-unknown-netbsdelf7.0-eabi +armv7eb-unknown-netbsdelf7.0-eabihf armv7eb-unknown-netbsdelf7.0-eabihf +armv7-unknown-netbsdelf7.0 armv7-unknown-netbsdelf7.0 +armv7-unknown-netbsdelf7.0-eabi armv7-unknown-netbsdelf7.0-eabi +armv7-unknown-netbsdelf7.0-eabihf armv7-unknown-netbsdelf7.0-eabihf +armv8b-linux-gnueabi armv8b-unknown-linux-gnueabi +aros i386-pc-aros +asmjs asmjs-unknown-none +avr32 avr32-unknown-none +avr32-linux avr32-unknown-linux-gnu +avr avr-unknown-none +ba ba-unknown-none +ba-elf ba-unknown-elf +ba-linux ba-unknown-linux-gnu +be32 be32-unknown-none +be32-none be32-unknown-none +be64 be64-unknown-none +be64-none be64-unknown-none +bfin bfin-unknown-none +bfin-elf bfin-unknown-elf +blackfin bfin-unknown-linux-gnu +c4x c4x-unknown-coff +c54x-coff tic54x-unknown-coff +c54x-none-coff tic54x-none-coff +c54x tic54x-unknown-coff +c54x-unknown-coff tic54x-unknown-coff +c55x-coff tic55x-unknown-coff +c55x-none-coff tic55x-none-coff +c55x tic55x-unknown-coff +c55x-unknown-coff tic55x-unknown-coff +c6x-coff tic6x-unknown-coff +c6x-elf tic6x-unknown-elf +c6x-none-coff tic6x-none-coff +c6x-none-elf tic6x-none-elf +c6x tic6x-unknown-coff +c6x-uclinux tic6x-unknown-uclinux +c6x-unknown-coff tic6x-unknown-coff +c6x-unknown-elf tic6x-unknown-elf +c8051 c8051-unknown-elf +c8051-elf c8051-unknown-elf +cegcc arm-unknown-cegcc +clipper clipper-unknown-none +cr16-elf cr16-unknown-elf +cr16-random-elf cr16-unknown-elf +cris-linux cris-axis-linux-gnu +crisv32-linux crisv32-axis-linux-gnu +d10v d10v-unknown-none +d30v d30v-unknown-none +dicos i686-pc-dicos +djgpp i586-pc-msdosdjgpp +dlx dlx-unknown-none +dsp16xx dsp16xx-unknown-none +e2k e2k-unknown-none +e2k-linux e2k-unknown-linux-gnu +e500v1-elf powerpc-unknown-elfspe +e500v2-elf powerpc-unknown-elfspe +e500v2-vxworksae powerpc-wrs-vxworksaespe +e500v2-wrs-linux powerpc-wrs-linux-gnuspe +e500v2-wrs-vxworks powerpc-wrs-vxworksspe +epiphany-elf epiphany-unknown-elf +epiphany epiphany-unknown-none +es1800 m68k-ericsson-ose +fido-elf fido-unknown-elf +fido fido-unknown-none +fr30 fr30-unknown-none +frv frv-unknown-none +frv-linux frv-unknown-linux-gnu +ft32-elf ft32-unknown-elf +ft32 ft32-unknown-none +h8300 h8300-unknown-none +h8500 h8500-unknown-none +hexagon hexagon-unknown-elf +hexagon-linux hexagon-unknown-linux-gnu +hppa1.0 hppa1.0-unknown-none +hppa2.0 hppa2.0-unknown-none +hppa2.0n hppa2.0n-unknown-none +hppa64 hppa64-unknown-none +hppa hppa-unknown-none +hppa-next hppa-next-nextstep +i370 i370-ibm-mvs +i370-opened i370-ibm-openedition +i386-386bsd i386-pc-bsd +i386-aros i386-pc-aros +i386-bitrig i386-pc-bitrig +i386-bsd i386-pc-bsd +i386-cloudabi i386-pc-cloudabi +i386-drops1.0 i386-pc-drops1.0 +i386-elf i386-pc-elf +i386-es i386-pc-es +i386-freebsd i386-pc-freebsd +i386-glidix i386-pc-glidix +i386-haiku i386-pc-haiku +i386-isc i386-pc-isc2.2 +i386-libertybsd i386-pc-libertybsd +i386-linux i386-pc-linux-gnu +i386-linux-musl i386-pc-linux-musl +i386-linux-newlib i386-pc-linux-newlib +i386-midipix i386-pc-midipix +i386-mingw32 i386-pc-mingw32 +i386-msys i386-pc-msys +i386-netbsd i386-pc-netbsd +i386-openbsd i386-pc-openbsd +i386-os2 i386-pc-os2 +i386-pc-nacl i386-pc-nacl +i386-pc-sco4 i386-pc-sco3.2v4 +i386-pc-sco5 i386-pc-sco3.2v5 +i386-pc-sco5v6 i386-pc-sco5v6 +i386-pc-sco6 i386-pc-sco5v6 +i386-pc-sco i386-pc-sco3.2v2 +i386-phoenix i386-pc-phoenix +i386-plan9 i386-pc-plan9 +i386-solidbsd i386-pc-solidbsd +i386-sortix i386-pc-sortix +i386-udk i386-pc-udk +i386-vsta i386-pc-vsta +i386-windows i386-pc-windows +i386-xenix i386-pc-xenix +i486-elf i486-pc-elf +i586-auroraux5.0 i586-pc-auroraux5.0 +i586-auroraux i586-pc-auroraux +i586-elf i586-pc-elf +i586-rdos i586-pc-rdos +i586-skyos i586-pc-skyos +i686-android-linux i686-unknown-linux-android +i686-dicos i686-pc-dicos +i686-elf i686-pc-elf +i686-ericsson-dicos i686-ericsson-dicos +i686-haiku i686-pc-haiku +i686-kopensolaris5.11-gnu i686-pc-kopensolaris5.11-gnu +i786-elf i786-pc-elf +i860 i860-unknown-sysv +i960 i960-unknown-none +ia16 ia16-unknown-none +ia64 ia64-unknown-none +ibm i370-ibm-aix +ip2k ip2k-unknown-none +iq2000 iq2000-unknown-none +k1om k1om-unknown-none +k1om-linux k1om-unknown-linux-gnu +le32 le32-unknown-none +le32-nacl le32-unknown-nacl +le64 le64-unknown-none +le64-none le64-unknown-none +leon3-elf sparc-leon3-elf +leon3-vxworks sparc-leon3-vxworks +leon-elf sparc-leon-elf +leon-wrs-vxworks sparc-leon-vxworks +lm32-elf lm32-unknown-elf +lm32 lm32-unknown-none +m32c-elf m32c-unknown-elf +m32c m32c-unknown-none +m32rle m32rle-unknown-none +m32r m32r-unknown-none +m68000 m68000-unknown-none +m68k m68k-unknown-none +m68k-es1800 m68k-unknown-ose +m68knommu m68k-unknown-linux-gnu +m88k m88k-unknown-none +m88k-omron m88k-omron-luna +maxq-elf maxq-unknown-elf +maxq maxq-unknown-none +mb-elf mb-unknown-elf +mb mb-unknown-none +mcore mcore-unknown-none +mep-elf mep-unknown-elf +mep mep-unknown-elf +metag-linux metag-unknown-linux-gnu +metag metag-unknown-none +microblazeel-elf microblazeel-unknown-elf +microblaze-elf microblaze-unknown-elf +microblazeel-linux microblazeel-unknown-linux-gnu +microblazeel microblazeel-unknown-none +microblaze-linux microblaze-unknown-linux-gnu +microblaze microblaze-unknown-none +mingw32ce arm-unknown-mingw32ce +mingw32 i686-pc-mingw32 +mingw64 x86_64-pc-mingw64 +mips16 mips16-unknown-elf +mips64el mips64el-unknown-elf +mips64 mips64-unknown-elf +mips64octeonel-elf mips64octeonel-unknown-elf +mips64octeon-elf mips64octeon-unknown-elf +mips64octeonel mips64octeonel-unknown-elf +mips64octeon mips64octeon-unknown-elf +mips64orionel mips64orionel-unknown-elf +mips64orion mips64orion-unknown-elf +mips64r5900el-elf mips64r5900el-unknown-elf +mips64r5900-elf mips64r5900-unknown-elf +mips64r5900el mips64r5900el-unknown-elf +mips64r5900 mips64r5900-unknown-elf +mips64vr4100el mips64vr4100el-unknown-elf +mips64vr4100 mips64vr4100-unknown-elf +mips64vr4300el mips64vr4300el-unknown-elf +mips64vr4300 mips64vr4300-unknown-elf +mips64vr5000el mips64vr5000el-unknown-elf +mips64vr5000 mips64vr5000-unknown-elf +mips64vr5900el-elf mips64vr5900el-unknown-elf +mips64vr5900-elf mips64vr5900-unknown-elf +mips64vr5900el mips64vr5900el-unknown-elf +mips64vr5900 mips64vr5900-unknown-elf +mips64vrel mips64vrel-unknown-elf +mips64vr mips64vr-unknown-elf +mipsbe mipsbe-unknown-elf +mipseb mipseb-unknown-elf +mipsel mipsel-unknown-elf +mipsisa32el mipsisa32el-unknown-elf +mipsisa32 mipsisa32-unknown-elf +mipsisa32r2el mipsisa32r2el-unknown-elf +mipsisa32r2 mipsisa32r2-unknown-elf +mipsisa32r6el-elf mipsisa32r6el-unknown-elf +mipsisa32r6-elf mipsisa32r6-unknown-elf +mipsisa32r6el mipsisa32r6el-unknown-elf +mipsisa32r6 mipsisa32r6-unknown-elf +mipsisa64el mipsisa64el-unknown-elf +mipsisa64 mipsisa64-unknown-elf +mipsisa64r2el mipsisa64r2el-unknown-elf +mipsisa64r2 mipsisa64r2-unknown-elf +mipsisa64r6el-elf mipsisa64r6el-unknown-elf +mipsisa64r6-elf mipsisa64r6-unknown-elf +mipsisa64r6el mipsisa64r6el-unknown-elf +mipsisa64r6 mipsisa64r6-unknown-elf +mipsisa64sb1el mipsisa64sb1el-unknown-elf +mipsisa64sb1 mipsisa64sb1-unknown-elf +mipsisa64sr71kel mipsisa64sr71kel-unknown-elf +mipsisa64sr71k mipsisa64sr71k-unknown-elf +mipsle mipsle-unknown-elf +mips mips-unknown-elf +mipsr5900el mipsr5900el-unknown-elf +mipsr5900 mipsr5900-unknown-elf +mips-sde-elf mips-sde-elf +mipstx39el mipstx39el-unknown-elf +mipstx39 mipstx39-unknown-elf +mmix-elf mmix-knuth-elf +mmix mmix-knuth-mmixware +mn10200 mn10200-unknown-none +mn10300 mn10300-unknown-none +moxiebox moxie-unknown-moxiebox +moxie-elf moxie-unknown-elf +moxie moxie-unknown-none +ms1-elf mt-unknown-elf +ms1 mt-unknown-none +msp430 msp430-unknown-none +msys i686-pc-msys +mt-elf mt-unknown-elf +mt mt-unknown-none +nacl le32-unknown-nacl +nds32be nds32be-unknown-none +nds32-elf nds32-unknown-elf +nds32le-elf nds32le-unknown-elf +nds32le nds32le-unknown-none +nds32 nds32-unknown-none +nios2eb-elf nios2eb-unknown-elf +nios2eb nios2eb-unknown-none +nios2el-elf nios2el-unknown-elf +nios2-elf nios2-unknown-elf +nios2el nios2el-unknown-none +nios2 nios2-unknown-none +nios-elf nios-unknown-elf +nios nios-unknown-none +ns16k ns16k-unknown-none +ns32k ns32k-unknown-none +nsv-tandem-nsk nsv-tandem-nsk +nsx-tandem-nsk nsx-tandem-nsk +nvptx nvptx-unknown-none +open8-elf open8-unknown-elf +open8 open8-unknown-none +openrisc-linux or32-unknown-linux-gnu +or1k64-unknown-linux or1k64-unknown-linux-gnu +or1k-company-elf or1k-company-elf +or1k-company-linux or1k-company-linux-gnu +or1k-elf or1k-unknown-elf +or1k-linux-gnu or1k-unknown-linux-gnu +or1k-linux or1k-unknown-linux-gnu +or1k-linux-uclibc or1k-unknown-linux-uclibc +or1knd-company-elf or1knd-company-elf +or1knd-company-linux or1knd-company-linux-gnu +or1knd-elf or1knd-unknown-elf +or1knd-linux-gnu or1knd-unknown-linux-gnu +or1knd-linux or1knd-unknown-linux-gnu +or1knd-linux-uclibc or1knd-unknown-linux-uclibc +or1knd or1knd-unknown-none +or1k or1k-unknown-none +or32-linux or32-unknown-linux-gnu +or32 or32-unknown-coff +os400 powerpc-ibm-os400 +ose68k m68k-ericsson-ose +ose m68k-ericsson-ose +parisc hppa-unknown-linux-gnu +pc98-freebsd i386-pc-freebsd +pdp10 pdp10-unknown-tops20 +pdp11 pdp11-dec-none +picochip picochip-unknown-none +pjl pjl-unknown-none +pj pj-unknown-none +powerpc64le powerpc64le-unknown-none +powerpc64 powerpc64-unknown-none +powerpc-bluegene powerpc-ibm-cnk +powerpc-cnk powerpc-ibm-cnk +powerpc-elf-lynxos5 powerpc-elf-lynxos5 +powerpc-elf-lynxos powerpc-elf-lynxos +powerpc-haiku powerpc-unknown-haiku +powerpcle powerpcle-unknown-none +powerpc-pikeos powerpc-unknown-elf +powerpc powerpc-unknown-none +powerpc-sysgo-pikeos powerpc-sysgo-elf +powerpc-xcoff-lynxos178 powerpc-xcoff-lynxos178 +ppc-beos powerpc-be-beos +ppcbe-elf powerpc-unknown-elf +ppcbe-none-elf powerpc-none-elf +ppcbe powerpc-unknown-none +ppc-elf powerpc-unknown-elf +ppcle-elf powerpcle-unknown-elf +ppcle-none-elf powerpcle-none-elf +ppcle powerpcle-unknown-none +ppc-none-elf powerpc-none-elf +ppc powerpc-unknown-none +pru-elf pru-unknown-elf +pru pru-unknown-elf +pyramid pyramid-unknown-none +rdos32 i386-pc-rdos +rdos64 x86_64-pc-rdos +rdos x86_64-pc-rdos +riscv32-company-elf riscv32-company-elf +riscv32-elf riscv32-unknown-elf +riscv32-linux riscv32-unknown-linux-gnu +riscv32 riscv32-unknown-none +riscv64-company-elf riscv64-company-elf +riscv64-elf riscv64-unknown-elf +riscv64-linux riscv64-unknown-linux-gnu +riscv64 riscv64-unknown-none +rl78-linux rl78-unknown-linux-gnu +rl78 rl78-unknown-none +rx-linux rx-unknown-linux-gnu +rx rx-unknown-none +s390-ibm-zvmoe s390-ibm-zvmoe +score-elf score-unknown-elf +score score-unknown-elf +sde-elf mipsisa32-sde-elf +sh sh-unknown-none +sh-elf sh-unknown-elf +sh-hms sh-hitachi-hms +sh1-elf sh1-unknown-elf +sh1le-elf sh1le-unknown-elf +sh1 sh1-unknown-none +sh2aeb-elf sh2aeb-unknown-elf +sh2aeb sh2aeb-unknown-none +sh2a-elf sh2a-unknown-elf +sh2a sh2a-unknown-none +sh2eb-elf sh2eb-unknown-elf +sh2eb sh2eb-unknown-none +sh2e-elf sh2e-unknown-elf +sh2-elf sh2-unknown-elf +sh2e sh2e-unknown-none +sh2le-elf sh2le-unknown-elf +sh2le sh2le-unknown-none +sh2 sh2-unknown-none +sh3eb-elf sh3eb-unknown-elf +sh3e-elf sh3e-unknown-elf +sh3ele-elf sh3ele-unknown-elf +sh3ele sh3ele-unknown-none +sh3-elf sh3-unknown-elf +sh3le-elf sh3le-unknown-elf +sh3 sh3-unknown-none +sh4aeb-elf sh4aeb-unknown-elf +sh4aeb sh4aeb-unknown-none +sh4a-elf sh4a-unknown-elf +sh4eb-elf sh4eb-unknown-elf +sh4-elf sh4-unknown-elf +sh4le-elf sh4le-unknown-elf +sh4 sh4-unknown-none +sh5el-elf sh5le-unknown-elf +sh5el-netbsd sh5le-unknown-netbsd +sh64-elf sh64-unknown-elf +sh64le sh64le-unknown-none +sh64 sh64-unknown-none +shbe-elf shbe-unknown-elf +shbe shbe-unknown-none +sheb-elf sheb-unknown-elf +sheb sheb-unknown-none +sh-elf sh-unknown-elf +shle-elf shle-unknown-elf +shle shle-unknown-none +sh sh-unknown-none +sh-toppers sh-unknown-toppers +simso-wrs sparclite-wrs-vxworks +sparc64b-linux sparc64b-unknown-linux-gnu +sparc64b sparc64b-unknown-none +sparc64-linux sparc64-unknown-linux-gnu +sparc64 sparc64-unknown-none +sparc64v-elf sparc64v-unknown-elf +sparc64v-solaris2.9 sparc64v-unknown-solaris2.9 +sparc64v sparc64v-unknown-none +sparc86x sparc86x-unknown-none +sparc-haiku sparc-unknown-haiku +sparclet sparclet-unknown-none +sparclite sparclite-unknown-none +sparclite-wrs sparclite-wrs-vxworks +sparc sparc-sun-sunos4.1.1 +sparcv8 sparcv8-unknown-none +sparcv9b sparcv9b-unknown-none +sparcv9 sparcv9-unknown-none +sparcv9v-elf sparcv9v-unknown-elf +sparcv9v-solaris2.9 sparcv9v-unknown-solaris2.9 +sparcv9v sparcv9v-unknown-none +spu-elf spu-unknown-elf +spu-linux spu-unknown-linux-gnu +spu spu-unknown-elf +st2000 m68k-tandem-none +strongarm arm-unknown-none +strongarm-none-elf arm-none-elf +sun386 i386-sun-sunos4.0.2 +sun3 m68k-sun-sunos4.1.1 +sun4 sparc-sun-sunos4.1.1 +sv1 sv1-cray-unicos +symmetry i386-sequent-bsd +t3e alphaev5-cray-unicos +t90 t90-cray-unicos +tahoe tahoe-unknown-none +thumb arm-unknown-none +thumb-none-elf arm-none-elf +tic4x tic4x-unknown-coff +tic54x-coff tic54x-unknown-coff +tic54x-none-coff tic54x-none-coff +tic54x tic54x-unknown-coff +tic54x-unknown-coff tic54x-unknown-coff +tic55x-coff tic55x-unknown-coff +tic55x-none-coff tic55x-none-coff +tic55x tic55x-unknown-coff +tic55x-unknown-coff tic55x-unknown-coff +tic6x-coff tic6x-unknown-coff +tic6x-elf tic6x-unknown-elf +tic6x-none-coff tic6x-none-coff +tic6x-none-elf tic6x-none-elf +tic6x tic6x-unknown-coff +tic6x-uclinux tic6x-unknown-uclinux +tic6x-unknown-coff tic6x-unknown-coff +tic6x-unknown-elf tic6x-unknown-elf +tic80 tic80-unknown-none +tile64 tile64-unknown-linux-gnu +tilegx-linux tilegx-unknown-linux-gnu +tilegx tilegx-unknown-linux-gnu +tilegx-unknown-linux tilegx-unknown-linux-gnu +tile-linux tile-unknown-linux-gnu +tile tile-unknown-linux-gnu +tile-unknown-linux tile-unknown-linux-gnu +tron tron-unknown-none +ubicom32-elf ubicom32-unknown-elf +ubicom32 ubicom32-unknown-none +v850e1-elf v850e1-unknown-elf +v850e1 v850e1-unknown-none +v850e2-elf v850e2-unknown-elf +v850e2v3-elf v850e2v3-unknown-elf +v850e2v3 v850e2v3-unknown-none +v850e2 v850e2-unknown-none +v850e-elf v850e-unknown-elf +v850-elf v850-unknown-elf +v850es-elf v850es-unknown-elf +v850es v850es-unknown-none +v850e v850e-unknown-none +v850 v850-unknown-none +visium-elf visium-unknown-elf +visium visium-unknown-none +vsta i386-unknown-vsta +wasm32 wasm32-unknown-none +we32k we32k-att-sysv +x64-linux x86_64-pc-linux-gnu +x86_64-cygwin x86_64-pc-cygwin +x86_64-dicos x86_64-pc-dicos +x86_64-ericsson-dicos x86_64-ericsson-dicos +x86_64-fuchsia x86_64-pc-fuchsia +x86_64-glidix x86_64-pc-glidix +x86_64-redox x86_64-pc-redox +x86_64-sortix x86_64-pc-sortix +x86_64-windows x86_64-pc-windows +x86 x86-unknown-none +xbox i686-pc-mingw32 +xc16x-elf xc16x-unknown-elf +xc16x xc16x-unknown-none +xgate xgate-unknown-none +xscale arm-unknown-none +xscaleeb armeb-unknown-none +xscaleeb-none-elf armeb-none-elf +xscaleel armel-unknown-none +xscaleel-none-elf armel-none-elf +xscale-none-elf arm-none-elf +xstormy16 xstormy16-unknown-none +xtensa_dc232b-linux xtensa_dc232b-unknown-linux-gnu +xtensa-elf xtensa-unknown-elf +xtensa-linux xtensa-unknown-linux-gnu +xtensa xtensa-unknown-none +z80-coff z80-unknown-coff +z80 z80-unknown-none +z8k z8k-unknown-none diff -Nru autotools-dev-20150820.1/testsuite/config-sub.sh autotools-dev-20180224.1~16.04.sav0/testsuite/config-sub.sh --- autotools-dev-20150820.1/testsuite/config-sub.sh 2015-09-11 21:21:48.000000000 +0000 +++ autotools-dev-20180224.1~16.04.sav0/testsuite/config-sub.sh 2018-02-24 16:00:57.000000000 +0000 @@ -4,16 +4,16 @@ # Contributed by Ben Elliston . # # This test reads pairs from config-sub.data: an alias and its -# canonical triplet. The config.sub scripts is invoked and the test -# checks that the alias expands to the expected canonical triplet. +# canonical triplet. config.sub is invoked and the test checks that +# the alias expands to the expected canonical triplet. verbose=false -run_config_sub () +run_config_sub() { rc=0 - while read alias canonical ; do - output=`sh ../config.sub $alias` + while read -r alias canonical ; do + output=$(../config.sub "$alias") if test "$output" != "$canonical" ; then echo "FAIL: $alias -> $output, but expected $canonical" rc=1 @@ -25,7 +25,8 @@ } if run_config_sub ; then - $verbose || echo "PASS: config.sub checks" + numtests=$(wc -l config-sub.data | cut -d' ' -f1) + $verbose || echo "PASS: config.sub checks ($numtests tests)" else exit 1 fi