projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 401aad6)
Update config.guess and config.sub
authorPeter Eisentraut
Thu, 30 Apr 2020 07:06:49 +0000 (09:06 +0200)
committerPeter Eisentraut
Thu, 30 Apr 2020 07:06:49 +0000 (09:06 +0200)
config/config.guess patch | blob | blame | history
config/config.sub patch | blob | blame | history

diff --git a/config/config.guess b/config/config.guess
index 79d1317f52b49ae6910f58a96a65d55abb479fb5..11fda528bc7b15f6a8a963a20c06cd9a6dbe5d6b 100644 (file)
--- a/config/config.guess
+++ b/config/config.guess
@@ -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-03-04'
+timestamp='2020-04-26'
 
 # 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 ;;
@@ -1468,6 +1477,14 @@ cat > "$dummy.c" <
 #include 
 #include 
 #endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
+#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
+#include 
+#if defined(_SIZE_T_) || defined(SIGLOST)
+#include 
+#endif
+#endif
+#endif
 main ()
 {
 #if defined (sony)
@@ -1554,19 +1571,24 @@ main ()
 #else
   printf ("vax-dec-bsd\n"); exit (0);
 #endif
+#else
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname un;
+  uname (&un);
+  printf ("vax-dec-ultrix%s\n", un.release); exit (0);
 #else
   printf ("vax-dec-ultrix\n"); exit (0);
 #endif
 #endif
+#endif
 #if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__)
 #if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__)
-#include 
-#if defined(_SIZE_T_) /* >= ULTRIX4 */
-  printf ("mips-dec-ultrix4\n"); exit (0);
+#if defined(_SIZE_T_) || defined(SIGLOST)
+  struct utsname *un;
+  uname (&un);
+  printf ("mips-dec-ultrix%s\n", un.release); exit (0);
 #else
-#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
-  printf ("mips-dec-ultrix3\n"); exit (0);
-#endif
+  printf ("mips-dec-ultrix\n"); exit (0);
 #endif
 #endif
 #endif
@@ -1607,6 +1629,12 @@ copies of config.guess and config.sub with the latest versions from:
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
+EOF
+
+year=`echo $timestamp | sed 's,-.*,,'`
+# shellcheck disable=SC2003
+if test "`expr "\`date +%Y\`" - "$year"`" -lt 3 ; then
+   cat >&2 <
 
 If $0 has already been updated, send the following data and any
 information you think might be pertinent to [email protected] to
@@ -1634,6 +1662,7 @@ UNAME_RELEASE = "$UNAME_RELEASE"
 UNAME_SYSTEM  = "$UNAME_SYSTEM"
 UNAME_VERSION = "$UNAME_VERSION"
 EOF
+fi
 
 exit 1
 
diff --git a/config/config.sub b/config/config.sub
index f53af5a2da7d16b2e6b2e02ac11fbac8e6235878..a0d12275ac5f15f1fda9de7af7469807b1e18a64 100644 (file)
--- a/config/config.sub
+++ b/config/config.sub
@@ -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-01-05'
+timestamp='2020-04-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
@@ -67,7 +67,7 @@ Report bugs and patches to ."
 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
@@ -1172,7 +1169,7 @@ case $cpu-$vendor in
            | asmjs \
            | ba \
            | be32 | be64 \
-           | bfin | bs2000 \
+           | bfin | bpf | bs2000 \
            | c[123]* | c30 | [cjt]90 | c4x \
            | c8051 | clipper | craynv | csky | cydra \
            | d10v | d30v | dlx | dsp16xx \
@@ -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|'`
This is the main PostgreSQL git repository.