projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 17e4082)
Update config.guess and config.sub
authorTom Lane
Sat, 10 May 2014 14:33:34 +0000 (10:33 -0400)
committerTom Lane
Sat, 10 May 2014 14:33:34 +0000 (10:33 -0400)
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 2055429b1ab16598ed3bbdbd675d86cbf6baee75..1f5c50c0d1529d50b94dc3533ca72a47f0fa5849 100755 (executable)
--- a/config/config.guess
+++ b/config/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-04-24'
+timestamp='2014-03-23'
 
 # 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-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -132,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+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
+   #include 
+   #if defined(__UCLIBC__)
+   LIBC=uclibc
+   #elif defined(__dietlibc__)
+   LIBC=dietlibc
+   #else
+   LIBC=gnu
+   #endif
+   EOF
+   eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+   ;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -805,7 +826,7 @@ EOF
     *:MINGW*:*)
    echo ${UNAME_MACHINE}-pc-mingw32
    exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
    echo ${UNAME_MACHINE}-pc-msys
    exit ;;
     i*:windows32*:*)
@@ -853,21 +874,21 @@ EOF
    exit ;;
     *:GNU:*:*)
    # the GNU system
-   echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`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/[-(].*//'`-gnu
+   echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
    exit ;;
     i*86:Minix:*:*)
    echo ${UNAME_MACHINE}-pc-minix
    exit ;;
     aarch64:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     aarch64_be:Linux:*:*)
    UNAME_MACHINE=aarch64_be
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     alpha:Linux:*:*)
    case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -880,67 +901,54 @@ EOF
      EV68*) UNAME_MACHINE=alphaev68 ;;
    esac
    objdump --private-headers /bin/sh | grep -q ld.so.1
-   if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-   echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+   if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     arm*:Linux:*:*)
    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-gnu
+       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-gnueabi
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
        else
-       echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+       echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
        fi
    fi
    exit ;;
     avr32*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     cris:Linux:*:*)
-   echo ${UNAME_MACHINE}-axis-linux-gnu
+   echo ${UNAME_MACHINE}-axis-linux-${LIBC}
    exit ;;
     crisv32:Linux:*:*)
-   echo ${UNAME_MACHINE}-axis-linux-gnu
+   echo ${UNAME_MACHINE}-axis-linux-${LIBC}
    exit ;;
     frv:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     hexagon:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     i*86:Linux:*:*)
-   LIBC=gnu
-   eval $set_cc_for_build
-   sed 's/^    //' << EOF >$dummy.c
-   #ifdef __dietlibc__
-   LIBC=dietlibc
-   #endif
-   #else
-   #include 
-   #ifdef __UCLIBC__
-   LIBC=uclibc
-   #endif
-EOF
-   eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-   echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+   echo ${UNAME_MACHINE}-pc-linux-${LIBC}
    exit ;;
     ia64:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     m32r*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     m68*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
    eval $set_cc_for_build
@@ -959,59 +967,63 @@ EOF
    #endif
 EOF
    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-   test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+   test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
    ;;
-    or1k:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+   echo or1k-unknown-linux-${LIBC}
    exit ;;
-    or32:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+    or32:Linux:*:* | or1k*:Linux:*:*)
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     padre:Linux:*:*)
-   echo sparc-unknown-linux-gnu
+   echo sparc-unknown-linux-${LIBC}
    exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-   echo hppa64-unknown-linux-gnu
+   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-gnu ;;
-     PA8*) echo hppa2.0-unknown-linux-gnu ;;
-     *)    echo hppa-unknown-linux-gnu ;;
+     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-gnu
+   echo powerpc64-unknown-linux-${LIBC}
    exit ;;
     ppc:Linux:*:*)
-   echo powerpc-unknown-linux-gnu
+   echo powerpc-unknown-linux-${LIBC}
+   exit ;;
+    ppc64le:Linux:*:*)
+   echo powerpc64le-unknown-linux-${LIBC}
+   exit ;;
+    ppcle:Linux:*:*)
+   echo powerpcle-unknown-linux-${LIBC}
    exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-   echo ${UNAME_MACHINE}-ibm-linux
+   echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
    exit ;;
     sh64*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     sh*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     tile*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     vax:Linux:*:*)
-   echo ${UNAME_MACHINE}-dec-linux-gnu
+   echo ${UNAME_MACHINE}-dec-linux-${LIBC}
    exit ;;
     x86_64:Linux:*:*)
-   LIBC=gnu
-   test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc
    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     xtensa*:Linux:*:*)
-   echo ${UNAME_MACHINE}-unknown-linux-gnu
+   echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
    exit ;;
     i*86:DYNIX/ptx:4*:*)
    # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1244,19 +1256,31 @@ EOF
    exit ;;
     *:Darwin:*:*)
    UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-   case $UNAME_PROCESSOR in
-       i386)
-       eval $set_cc_for_build
-       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
-             UNAME_PROCESSOR="x86_64"
-         fi
-       fi ;;
-       unknown) UNAME_PROCESSOR=powerpc ;;
-   esac
+   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 (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
+       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
+   fi
    echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
    exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1347,154 +1371,6 @@ EOF
    exit ;;
 esac
 
-eval $set_cc_for_build
-cat >$dummy.c <
-#ifdef _SEQUENT_
-# include 
-# include 
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include 
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-   "4"
-#else
-   ""
-#endif
-   ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-   printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-   printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include 
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-   { echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-   echo c1-convex-bsd
-   exit ;;
-    c2*)
-   if getsysinfo -f scalar_acc
-   then echo c32-convex-bsd
-   else echo c2-convex-bsd
-   fi
-   exit ;;
-    c34*)
-   echo c34-convex-bsd
-   exit ;;
-    c38*)
-   echo c38-convex-bsd
-   exit ;;
-    c4*)
-   echo c4-convex-bsd
-   exit ;;
-    esac
-fi
-
 cat >&2 <
 $0: unable to guess system type
 
diff --git a/config/config.sub b/config/config.sub
index 8b612ab89df97769d827a8b7f64e1dad21ac0b71..d654d03cdcd2226a5d7584890717e674a8122f4f 100755 (executable)
--- a/config/config.sub
+++ b/config/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2013 Free Software Foundation, Inc.
+#   Copyright 1992-2014 Free Software Foundation, Inc.
 
-timestamp='2013-04-24'
+timestamp='2014-05-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
@@ -68,7 +68,7 @@ Report bugs and patches to ."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2013 Free Software Foundation, Inc.
+Copyright 1992-2014 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."
@@ -257,7 +257,7 @@ case $basic_machine in
    | avr | avr32 \
    | be32 | be64 \
    | bfin \
-   | c4x | clipper \
+   | c4x | c8051 | clipper \
    | d10v | d30v | dlx | dsp16xx \
    | epiphany \
    | fido | fr30 | frv \
@@ -265,6 +265,7 @@ case $basic_machine in
    | hexagon \
    | i370 | i860 | i960 | ia64 \
    | ip2k | iq2000 \
+   | k1om \
    | le32 | le64 \
    | lm32 \
    | m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@ case $basic_machine in
    | mips64vr5900 | mips64vr5900el \
    | mipsisa32 | mipsisa32el \
    | mipsisa32r2 | mipsisa32r2el \
+   | mipsisa32r6 | mipsisa32r6el \
    | mipsisa64 | mipsisa64el \
    | mipsisa64r2 | mipsisa64r2el \
+   | mipsisa64r6 | mipsisa64r6el \
    | mipsisa64sb1 | mipsisa64sb1el \
    | mipsisa64sr71k | mipsisa64sr71kel \
    | mipsr5900 | mipsr5900el \
@@ -295,8 +298,7 @@ case $basic_machine in
    | nds32 | nds32le | nds32be \
    | nios | nios2 | nios2eb | nios2el \
    | ns16k | ns32k \
-   | open8 \
-   | or1k | or32 \
+   | open8 | or1k | or1knd | or32 \
    | pdp10 | pdp11 | pj | pjl \
    | powerpc | powerpc64 | powerpc64le | powerpcle \
    | pyramid \
@@ -324,7 +326,7 @@ case $basic_machine in
    c6x)
        basic_machine=tic6x-unknown
        ;;
-   m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+   m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
        basic_machine=$basic_machine-unknown
        os=-none
        ;;
@@ -372,7 +374,7 @@ case $basic_machine in
    | be32-* | be64-* \
    | bfin-* | bs2000-* \
    | c[123]* | c30-* | [cjt]90-* | c4x-* \
-   | clipper-* | craynv-* | cydra-* \
+   | c8051-* | clipper-* | craynv-* | cydra-* \
    | d10v-* | d30v-* | dlx-* \
    | elxsi-* \
    | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -381,6 +383,7 @@ case $basic_machine in
    | hexagon-* \
    | i*86-* | i860-* | i960-* | ia64-* \
    | ip2k-* | iq2000-* \
+   | k1om-* \
    | le32-* | le64-* \
    | lm32-* \
    | m32c-* | m32r-* | m32rle-* \
@@ -400,8 +403,10 @@ case $basic_machine in
    | mips64vr5900-* | mips64vr5900el-* \
    | mipsisa32-* | mipsisa32el-* \
    | mipsisa32r2-* | mipsisa32r2el-* \
+   | mipsisa32r6-* | mipsisa32r6el-* \
    | mipsisa64-* | mipsisa64el-* \
    | mipsisa64r2-* | mipsisa64r2el-* \
+   | mipsisa64r6-* | mipsisa64r6el-* \
    | mipsisa64sb1-* | mipsisa64sb1el-* \
    | mipsisa64sr71k-* | mipsisa64sr71kel-* \
    | mipsr5900-* | mipsr5900el-* \
@@ -413,6 +418,7 @@ case $basic_machine in
    | nios-* | nios2-* | nios2eb-* | nios2el-* \
    | none-* | np1-* | ns16k-* | ns32k-* \
    | open8-* \
+   | or1k*-* \
    | orion-* \
    | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -794,7 +800,7 @@ case $basic_machine in
        os=-mingw64
        ;;
    mingw32)
-       basic_machine=i386-pc
+       basic_machine=i686-pc
        os=-mingw32
        ;;
    mingw32ce)
@@ -830,7 +836,7 @@ case $basic_machine in
        basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
        ;;
    msys)
-       basic_machine=i386-pc
+       basic_machine=i686-pc
        os=-msys
        ;;
    mvs)
@@ -1374,7 +1380,7 @@ case $os in
          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
          | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-         | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+         | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
    # Remember, each alternative MUST END IN *, to match a version number.
        ;;
    -qnx*)
@@ -1546,6 +1552,9 @@ case $basic_machine in
    c4x-* | tic4x-*)
        os=-coff
        ;;
+   c8051-*)
+       os=-elf
+       ;;
    hexagon-*)
        os=-elf
        ;;
@@ -1589,9 +1598,6 @@ case $basic_machine in
    mips*-*)
        os=-elf
        ;;
-   or1k-*)
-       os=-elf
-       ;;
    or32-*)
        os=-coff
        ;;
This is the main PostgreSQL git repository.