Update from Gnulib

This causes config.guess to assume support for shell functions,
a safe assumption nowadays.
* build-aux/config.guess, build-aux/config.sub: Copy from Gnulib.

2 files changed, 44 insertions, 42 deletions

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 2b79f6d837b..ced991e4177 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-06'
+timestamp='2018-07-13'
 
 # 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
@@ -84,8 +84,6 @@ if test $# != 0; then
   exit 1
 fi
 
-trap 'exit 1' 1 2 15
-
 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
 # compiler to aid in system detection is discouraged as it requires
 # temporary files to be created and, as you can see below, it is a
@@ -96,30 +94,35 @@ trap 'exit 1' 1 2 15
 
 # Portable tmp directory creation inspired by the Autoconf team.
 
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp 2>/dev/null) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
- ,,)    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
-             CC_FOR_BUILD="$c"; break ;
-          fi ;
-        done ;
-        if test x"$CC_FOR_BUILD" = x ; then
-          CC_FOR_BUILD=no_compiler_found ;
-        fi
-        ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
+tmp=
+# shellcheck disable=SC2172
+trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15
+trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0
+
+set_cc_for_build() {
+    : "${TMPDIR=/tmp}"
+    # shellcheck disable=SC2039
+    { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+        { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||
+        { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+        { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }
+    dummy=$tmp/dummy
+    case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in
+        ,,)    echo "int x;" > "$dummy.c"
+               for driver in cc gcc c89 c99 ; do
+                   if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then
+                       CC_FOR_BUILD="$driver"
+                       break
+                   fi
+               done
+               if test x"$CC_FOR_BUILD" = x ; then
+                   CC_FOR_BUILD=no_compiler_found
+               fi
+               ;;
+        ,,*)   CC_FOR_BUILD=$CC ;;
+        ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+    esac
+}
 
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 1994-08-24)
@@ -138,7 +141,7 @@ Linux|GNU|GNU/*)
         # We could probably try harder.
         LIBC=gnu
 
-        eval "$set_cc_for_build"
+        set_cc_for_build
         cat <<-EOF > "$dummy.c"
         #include <features.h>
         #if defined(__UCLIBC__)
@@ -199,7 +202,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
                 os=netbsdelf
                 ;;
             arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-                eval "$set_cc_for_build"
+                set_cc_for_build
                 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
                         | grep -q __ELF__
                 then
@@ -389,7 +392,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
         echo i386-pc-auroraux"$UNAME_RELEASE"
         exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-        eval "$set_cc_for_build"
+        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.
@@ -482,7 +485,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
         echo clipper-intergraph-clix"$UNAME_RELEASE"
         exit ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         sed 's/^        //' << EOF > "$dummy.c"
 #ifdef __cplusplus
 #include <stdio.h>  /* for printf() prototype */
@@ -579,7 +582,7 @@ EOF
         exit ;;
     *:AIX:2:3)
         if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                eval "$set_cc_for_build"
+                set_cc_for_build
                 sed 's/^                //' << EOF > "$dummy.c"
                 #include <sys/systemcfg.h>
 
@@ -660,7 +663,7 @@ EOF
                     esac
                 fi
                 if [ "$HP_ARCH" = "" ]; then
-                    eval "$set_cc_for_build"
+                    set_cc_for_build
                     sed 's/^            //' << EOF > "$dummy.c"
 
                 #define _HPUX_SOURCE
@@ -700,7 +703,7 @@ EOF
         esac
         if [ "$HP_ARCH" = hppa2.0w ]
         then
-            eval "$set_cc_for_build"
+            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
@@ -726,7 +729,7 @@ EOF
         echo ia64-hp-hpux"$HPUX_REV"
         exit ;;
     3050*:HI-UX:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         sed 's/^        //' << EOF > "$dummy.c"
         #include <unistd.h>
         int
@@ -922,7 +925,7 @@ EOF
         echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     arm*:Linux:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
             | grep -q __ARM_EABI__
         then
@@ -971,7 +974,7 @@ EOF
         echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
         exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
-        eval "$set_cc_for_build"
+        set_cc_for_build
         sed 's/^        //' << EOF > "$dummy.c"
         #undef CPU
         #undef ${UNAME_MACHINE}
@@ -1285,7 +1288,7 @@ EOF
         exit ;;
     *:Darwin:*:*)
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-        eval "$set_cc_for_build"
+        set_cc_for_build
         if test "$UNAME_PROCESSOR" = unknown ; then
             UNAME_PROCESSOR=powerpc
         fi
@@ -1358,6 +1361,7 @@ EOF
         # "uname -m" is not consistent, so use $cputype instead. 386
         # is converted to i386 for consistency with other x86
         # operating systems.
+        # shellcheck disable=SC2154
         if test "$cputype" = 386; then
             UNAME_MACHINE=i386
         else
diff --git a/build-aux/config.sub b/build-aux/config.sub
index c95acc681d1..64f9b14b55b 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
 
-timestamp='2018-07-03'
+timestamp='2018-07-13'
 
 # 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
@@ -739,6 +739,7 @@ case $basic_machine in
         | mipsr5900-* | mipsr5900el-* \
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
+        | moxie-* \
         | mt-* \
         | msp430-* \
         | nds32-* | nds32le-* | nds32be-* \
@@ -1263,9 +1264,6 @@ case $basic_machine in
         pmac | pmac-mpw)
                 basic_machine=powerpc-apple
                 ;;
-        *-unknown)
-                # Make sure to match an already-canonicalized machine name.
-                ;;
         *)
                 echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2
                 exit 1