Update top level config files with copies from the official repository.
authorNick Clifton <nickc@redhat.com>
Sat, 18 Jan 2020 13:43:19 +0000 (13:43 +0000)
committerNick Clifton <nickc@redhat.com>
Sat, 18 Jan 2020 13:43:19 +0000 (13:43 +0000)
2020-01-01  Ben Elliston  <bje@gnu.org>

* config.guess: Update copyright years.
* config.sub: Likewise.

2019-12-21  Ben Elliston  <bje@gnu.org>

* config.guess (set_cc_for_build): Prevent multiple calls by
checking if $tmp is already set. We can't check CC_FOR_BUILD as
the user may set it externally. Thanks to Torbj?rn Granlund for
the bug report.

2019-12-21  Torbj?rn Granlund  <tg@gmplib.org>

* config.guess (alpha:Linux:*:*): Guard against missing
/proc/cpuinfo by redirecting standard error to /dev/null.

2019-09-12  Daniel Bittman  <danielbittman1@gmail.com>

* config.guess (*:Twizzler:*:*): New.
* config.sub (-twizzler*): New.

2019-07-24  Ben Elliston  <bje@gnu.org>

* config.guess (mips:OSF1:*.*): Whitespace cleanup.

2019-06-30  Ben Elliston  <bje@gnu.org>

* config.sub (case $os): Match nsk* and powerunix. Don't later
match nsk* and set os=nsk which removes the OS version number.

2019-06-30  Ben Elliston  <bje@gnu.org>

* config.sub: Recognise os108*.

2019-06-26  Ben Elliston  <bje@gnu.org>

* config.sub (hp300): Set $os to hpux.

2019-06-26  Ben Elliston  <bje@gnu.org>

* config.sub (vsta): Move into alphabetical order.

2019-06-10  Ben Elliston  <bje@gnu.org>

* config.guess (*:OS108:*:*): Recognise new OS.

2019-05-28  Ben Elliston  <bje@gnu.org>

* config.guess (*:Darwin:*:*): Run xcode-select to determine if a
system compiler is installed. If not, do not run set_cc_for_build,
as the default cc will open a dialog box asking to install
Xcode. If no C compiler is available, guess based on uname -p and
uname -m.

2019-05-28  Ben Elliston  <bje@gnu.org>

* config.guess (*:Darwin:*:*): Simplify UNAME_PROCESSOR.

ChangeLog
config.guess
config.sub

index f97f9623e9d2924a0b42f4ed626e660a09db77ec..b3b27df7ad419a4ae3adb6f60b017100cd514947 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,66 @@
+2020-01-18  Nick Clifton  <nickc@redhat.com>
+
+       Synchronize top level configure files with master version:
+
+       2020-01-01  Ben Elliston  <bje@gnu.org>
+
+       * config.guess: Update copyright years.
+       * config.sub: Likewise.
+
+       2019-12-21  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (set_cc_for_build): Prevent multiple calls by
+       checking if $tmp is already set. We can't check CC_FOR_BUILD as
+       the user may set it externally. Thanks to Torbjörn Granlund for
+       the bug report.
+
+       2019-12-21  Torbjörn Granlund  <tg@gmplib.org>
+
+       * config.guess (alpha:Linux:*:*): Guard against missing
+       /proc/cpuinfo by redirecting standard error to /dev/null.
+
+       2019-09-12  Daniel Bittman  <danielbittman1@gmail.com>
+
+       * config.guess (*:Twizzler:*:*): New.
+       * config.sub (-twizzler*): New.
+
+       2019-07-24  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (mips:OSF1:*.*): Whitespace cleanup.
+
+       2019-06-30  Ben Elliston  <bje@gnu.org>
+
+       * config.sub (case $os): Match nsk* and powerunix. Don't later
+       match nsk* and set os=nsk which removes the OS version number.
+
+       2019-06-30  Ben Elliston  <bje@gnu.org>
+
+       * config.sub: Recognise os108*.
+
+       2019-06-26  Ben Elliston  <bje@gnu.org>
+
+       * config.sub (hp300): Set $os to hpux.
+
+       2019-06-26  Ben Elliston  <bje@gnu.org>
+
+       * config.sub (vsta): Move into alphabetical order.
+
+       2019-06-10  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (*:OS108:*:*): Recognise new OS.
+
+       2019-05-28  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (*:Darwin:*:*): Run xcode-select to determine if a
+       system compiler is installed. If not, do not run set_cc_for_build,
+       as the default cc will open a dialog box asking to install
+       Xcode. If no C compiler is available, guess based on uname -p and
+       uname -m.
+
+       2019-05-28  Ben Elliston  <bje@gnu.org>
+
+       * config.guess (*:Darwin:*:*): Simplify UNAME_PROCESSOR.
+
 2020-01-17  Simon Marchi  <simon.marchi@efficios.com>
 
        * Makefile.def: Add dependencies of all-gdbsupport on all-bfd.
index 4cd9454b35c4a1cf8aad593fc56f3bfc2d6320ed..45001cfecde8f3e0716992163e3e211b6997f749 100755 (executable)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-04-28'
+timestamp='2020-01-01'
 
 # 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
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 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."
@@ -99,6 +99,8 @@ tmp=
 trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15
 
 set_cc_for_build() {
+    # prevent multiple calls if $tmp is already set
+    test "$tmp" && return 0
     : "${TMPDIR=/tmp}"
     # shellcheck disable=SC2039
     { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
@@ -262,6 +264,9 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:SolidBSD:*:*)
        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
        exit ;;
+    *:OS108:*:*)
+       echo "$UNAME_MACHINE"-unknown-os108_"$UNAME_RELEASE"
+       exit ;;
     macppc:MirBSD:*:*)
        echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
        exit ;;
@@ -271,12 +276,15 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in
     *:Sortix:*:*)
        echo "$UNAME_MACHINE"-unknown-sortix
        exit ;;
+    *:Twizzler:*:*)
+       echo "$UNAME_MACHINE"-unknown-twizzler
+       exit ;;
     *:Redox:*:*)
        echo "$UNAME_MACHINE"-unknown-redox
        exit ;;
     mips:OSF1:*.*)
-        echo mips-dec-osf1
-        exit ;;
+       echo mips-dec-osf1
+       exit ;;
     alpha:OSF1:*:*)
        case $UNAME_RELEASE in
        *4.0)
@@ -918,7 +926,7 @@ EOF
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
        exit ;;
     alpha:Linux:*:*)
-       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+       case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in
          EV5)   UNAME_MACHINE=alphaev5 ;;
          EV56)  UNAME_MACHINE=alphaev56 ;;
          PCA56) UNAME_MACHINE=alphapca56 ;;
@@ -1325,38 +1333,39 @@ EOF
        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE"
        exit ;;
     *:Darwin:*:*)
-       UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-       set_cc_for_build
-       if test "$UNAME_PROCESSOR" = unknown ; then
-           UNAME_PROCESSOR=powerpc
+       UNAME_PROCESSOR=`uname -p`
+       case $UNAME_PROCESSOR in
+           unknown) UNAME_PROCESSOR=powerpc ;;
+       esac
+       if command -v xcode-select > /dev/null 2> /dev/null && \
+               ! xcode-select --print-path > /dev/null 2> /dev/null ; then
+           # Avoid executing cc if there is no toolchain installed as
+           # cc will be a stub that puts up a graphical alert
+           # prompting the user to install developer tools.
+           CC_FOR_BUILD=no_compiler_found
+       else
+           set_cc_for_build
        fi
-       if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then
-           if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
-               if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-                      (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
-                      grep IS_64BIT_ARCH >/dev/null
-               then
-                   case $UNAME_PROCESSOR in
-                       i386) UNAME_PROCESSOR=x86_64 ;;
-                       powerpc) UNAME_PROCESSOR=powerpc64 ;;
-                   esac
-               fi
-               # 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
+       if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
+           if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+                  (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
+                  grep IS_64BIT_ARCH >/dev/null
+           then
+               case $UNAME_PROCESSOR in
+                   i386) UNAME_PROCESSOR=x86_64 ;;
+                   powerpc) UNAME_PROCESSOR=powerpc64 ;;
+               esac
+           fi
+           # 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
        elif test "$UNAME_PROCESSOR" = i386 ; then
-           # Avoid executing cc on OS X 10.9, as it ships with a stub
-           # that puts up a graphical alert prompting to install
-           # developer tools.  Any system running Mac OS X 10.7 or
-           # later (Darwin 11 and later) is required to have a 64-bit
-           # processor. This is not true of the ARM version of Darwin
-           # that Apple uses in portable devices.
-           UNAME_PROCESSOR=x86_64
+           # uname -m returns i386 or x86_64
+           UNAME_PROCESSOR=$UNAME_MACHINE
        fi
        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE"
        exit ;;
index 5b158ac41c9a2635e60fb583d66c4c2c0498163a..f02d43ad500ca9fc7467e3f28151ce18bc98bfa3 100755 (executable)
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2019 Free Software Foundation, Inc.
+#   Copyright 1992-2020 Free Software Foundation, Inc.
 
-timestamp='2019-05-23'
+timestamp='2020-01-01'
 
 # 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
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2019 Free Software Foundation, Inc.
+Copyright 1992-2020 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."
@@ -337,17 +337,14 @@ case $1 in
                                basic_machine=m88k-harris
                                os=sysv3
                                ;;
-                       hp300)
+                       hp300 | hp300hpux)
                                basic_machine=m68k-hp
+                               os=hpux
                                ;;
                        hp300bsd)
                                basic_machine=m68k-hp
                                os=bsd
                                ;;
-                       hp300hpux)
-                               basic_machine=m68k-hp
-                               os=hpux
-                               ;;
                        hppaosf)
                                basic_machine=hppa1.1-hp
                                os=osf
@@ -360,10 +357,6 @@ case $1 in
                                basic_machine=i386-mach
                                os=mach
                                ;;
-                       vsta)
-                               basic_machine=i386-pc
-                               os=vsta
-                               ;;
                        isi68 | isi)
                                basic_machine=m68k-isi
                                os=sysv
@@ -612,6 +605,10 @@ case $1 in
                                basic_machine=vax-dec
                                os=vms
                                ;;
+                       vsta)
+                               basic_machine=i386-pc
+                               os=vsta
+                               ;;
                        vxworks960)
                                basic_machine=i960-wrs
                                os=vxworks
@@ -1346,11 +1343,11 @@ case $os in
             | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
             | sym* | kopensolaris* | plan9* \
             | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
-            | aos* | aros* | cloudabi* | sortix* \
+            | aos* | aros* | cloudabi* | sortix* | twizzler* \
             | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
             | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
             | knetbsd* | mirbsd* | netbsd* \
-            | bitrig* | openbsd* | solidbsd* | libertybsd* \
+            | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
             | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
             | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
             | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
@@ -1368,7 +1365,8 @@ case $os in
             | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
             | skyos* | haiku* | rdos* | toppers* | drops* | es* \
             | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
-            | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi*)
+            | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+            | nsk* | powerunix)
        # Remember, each alternative MUST END IN *, to match a version number.
                ;;
        qnx*)
@@ -1452,9 +1450,6 @@ case $os in
        ns2)
                os=nextstep2
                ;;
-       nsk*)
-               os=nsk
-               ;;
        # Preserve the version number of sinix5.
        sinix5.*)
                os=`echo $os | sed -e 's|sinix|sysv|'`