Update 050_autotools-config.patch with autotools-dev 20140510.1

(Note: Debian package uses dh addon instead of this patch)

1 files changed, 223 insertions, 133 deletions

diff --git a/debian/patches/050_autotools-config.patch b/debian/patches/050_autotools-config.patch
index f331302..fb1707e 100644
--- a/debian/patches/050_autotools-config.patch
+++ b/debian/patches/050_autotools-config.patch
@@ -1,14 +1,14 @@
 Subject: Update config.guess and config.sub
 From: Tatsuya Kinoshita <tats@debian.org>
 
-Updated with autotools-dev 20130810.1.
+Updated with autotools-dev 20140510.1.
 
 Note that Debian package uses autotools-dev dh addon,
 dh_autotools-dev_updateconfig and dh_autotools-dev_restoreconfig,
 instead of this patch.
 
 diff --git a/config.guess b/config.guess
-index 51fab47..b79252d 100755
+index 51fab47..1f5c50c 100755
 --- a/config.guess
 +++ b/config.guess
 @@ -1,13 +1,12 @@
@@ -16,10 +16,10 @@ index 51fab47..b79252d 100755
  # Attempt to guess a canonical system name.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
  
 -timestamp='2004-03-12'
-+timestamp='2013-06-10'
++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
@@ -69,7 +69,7 @@ index 51fab47..b79252d 100755
  Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+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."
@@ -127,7 +127,7 @@ index 51fab47..b79252d 100755
 +	LIBC=gnu
 +	#endif
 +	EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
 +	;;
 +esac
 +
@@ -913,7 +913,7 @@ index 51fab47..b79252d 100755
  	echo ${UNAME_MACHINE}-pc-mingw32
 -	exit 0 ;;
 +	exit ;;
-+    i*:MSYS*:*)
++    *:MSYS*:*)
 +	echo ${UNAME_MACHINE}-pc-msys
 +	exit ;;
 +    i*:windows32*:*)
@@ -1126,10 +1126,10 @@ index 51fab47..b79252d 100755
 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 -	exit 0 ;;
-+    or1k:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
++    openrisc*:Linux:*:*)
++	echo or1k-unknown-linux-${LIBC}
 +	exit ;;
-+    or32:Linux:*:*)
++    or32:Linux:*:* | or1k*:Linux:*:*)
 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 +	exit ;;
 +    padre:Linux:*:*)
@@ -1440,7 +1440,7 @@ index 51fab47..b79252d 100755
      *:SINIX-*:*:*)
  	if uname -p 2>/dev/null >/dev/null ; then
  		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -1140,68 +1180,99 @@ EOF
+@@ -1140,68 +1180,109 @@ EOF
  	else
  		echo ns32k-sni-sysv
  	fi
@@ -1549,16 +1549,26 @@ index 51fab47..b79252d 100755
 +	if test "$UNAME_PROCESSOR" = unknown ; 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
++	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 0 ;;
@@ -1566,7 +1576,7 @@ index 51fab47..b79252d 100755
      *:procnto*:*:* | *:QNX:[0123456789]*:*)
  	UNAME_PROCESSOR=`uname -p`
  	if test "$UNAME_PROCESSOR" = "x86"; then
-@@ -1209,22 +1280,28 @@ EOF
+@@ -1209,22 +1290,28 @@ EOF
  		UNAME_MACHINE=pc
  	fi
  	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
@@ -1601,7 +1611,7 @@ index 51fab47..b79252d 100755
      *:Plan9:*:*)
  	# "uname -m" is not consistent, so use $cputype instead. 386
  	# is converted to i386 for consistency with other x86
-@@ -1235,36 +1312,55 @@ EOF
+@@ -1235,183 +1322,55 @@ EOF
  	    UNAME_MACHINE="$cputype"
  	fi
  	echo ${UNAME_MACHINE}-unknown-plan9
@@ -1667,74 +1677,157 @@ index 51fab47..b79252d 100755
 -#echo '(No uname command or uname output not recognized.)' 1>&2
 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 -
- eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
-@@ -1282,16 +1378,16 @@ main ()
- #include <sys/param.h>
-   printf ("m68k-sony-newsos%s\n",
- #ifdef NEWSOS4
+-eval $set_cc_for_build
+-cat >$dummy.c <<EOF
+-#ifdef _SEQUENT_
+-# include <sys/types.h>
+-# include <sys/utsname.h>
+-#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 <sys/param.h>
+-  printf ("m68k-sony-newsos%s\n",
+-#ifdef NEWSOS4
 -          "4"
-+	"4"
- #else
+-#else
 -	  ""
-+	""
- #endif
+-#endif
 -         ); exit (0);
-+	); exit (0);
- #endif
- #endif
- 
- #if defined (__arm) && defined (__acorn) && defined (__unix)
+-#endif
+-#endif
+-
+-#if defined (__arm) && defined (__acorn) && defined (__unix)
 -  printf ("arm-acorn-riscix"); exit (0);
-+  printf ("arm-acorn-riscix\n"); exit (0);
- #endif
- 
- #if defined (hp300) && !defined (hpux)
-@@ -1380,11 +1476,12 @@ main ()
- }
- EOF
- 
+-#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 <sys/param.h>
+-#  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 && $dummy && exit 0
-+$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.
- 
+-
+-# Apollos put the system type in the environment.
+-
 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
- 
- # Convex versions that predate uname can use getsysinfo(1)
- 
-@@ -1393,22 +1490,22 @@ then
-     case `getsysinfo -f cpu_type` in
-     c1*)
- 	echo c1-convex-bsd
+-
+-# 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 0 ;;
-+	exit ;;
-     c2*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
+-    c2*)
+-	if getsysinfo -f scalar_acc
+-	then echo c32-convex-bsd
+-	else echo c2-convex-bsd
+-	fi
 -	exit 0 ;;
-+	exit ;;
-     c34*)
- 	echo c34-convex-bsd
+-    c34*)
+-	echo c34-convex-bsd
 -	exit 0 ;;
-+	exit ;;
-     c38*)
- 	echo c38-convex-bsd
+-    c38*)
+-	echo c38-convex-bsd
 -	exit 0 ;;
-+	exit ;;
-     c4*)
- 	echo c4-convex-bsd
+-    c4*)
+-	echo c4-convex-bsd
 -	exit 0 ;;
-+	exit ;;
-     esac
- fi
+-    esac
+-fi
+-
+ cat >&2 <<EOF
+ $0: unable to guess system type
  
-@@ -1419,7 +1516,9 @@ This script, last modified $timestamp, has failed to recognize
+@@ -1419,7 +1378,9 @@ This script, last modified $timestamp, has failed to recognize
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -1746,7 +1839,7 @@ index 51fab47..b79252d 100755
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
 diff --git a/config.sub b/config.sub
-index ba33103..9633db7 100755
+index ba33103..d654d03 100755
 --- a/config.sub
 +++ b/config.sub
 @@ -1,42 +1,40 @@
@@ -1754,10 +1847,10 @@ index ba33103..9633db7 100755
  # Configuration validation subroutine script.
 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-+#   Copyright 1992-2013 Free Software Foundation, Inc.
++#   Copyright 1992-2014 Free Software Foundation, Inc.
  
 -timestamp='2004-03-12'
-+timestamp='2013-08-10'
++timestamp='2014-05-01'
  
 -# This file is (in principle) common to ALL GNU software.
 -# The presence of a machine in this file suggests that SOME GNU software
@@ -1817,7 +1910,7 @@ index ba33103..9633db7 100755
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
 -Free Software Foundation, Inc.
-+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."
@@ -1926,7 +2019,7 @@ index ba33103..9633db7 100755
  	-lynx*)
  		os=-lynxos
  		;;
-@@ -227,57 +248,106 @@ case $basic_machine in
+@@ -227,57 +248,108 @@ case $basic_machine in
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
@@ -1951,6 +2044,7 @@ index ba33103..9633db7 100755
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
 -	| m32r | m32rle | m68000 | m68k | m88k | mcore \
++	| k1om \
 +	| le32 | le64 \
 +	| lm32 \
 +	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -1969,8 +2063,10 @@ index ba33103..9633db7 100755
 +	| mips64vr5900 | mips64vr5900el \
  	| mipsisa32 | mipsisa32el \
  	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa32r6 | mipsisa32r6el \
  	| mipsisa64 | mipsisa64el \
  	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64r6 | mipsisa64r6el \
  	| mipsisa64sb1 | mipsisa64sb1el \
  	| mipsisa64sr71k | mipsisa64sr71kel \
 +	| mipsr5900 | mipsr5900el \
@@ -1983,8 +2079,7 @@ index ba33103..9633db7 100755
 +	| nios | nios2 | nios2eb | nios2el \
  	| ns16k | ns32k \
 -	| openrisc | or32 \
-+	| open8 \
-+	| or1k | or32 \
++	| open8 | or1k | or1knd | or32 \
  	| pdp10 | pdp11 | pj | pjl \
 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
@@ -2022,7 +2117,7 @@ index ba33103..9633db7 100755
 +	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
  		;;
@@ -2049,7 +2144,7 @@ index ba33103..9633db7 100755
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -293,59 +363,82 @@ case $basic_machine in
+@@ -293,59 +365,86 @@ case $basic_machine in
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
@@ -2078,6 +2173,7 @@ index ba33103..9633db7 100755
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
 -	| m32r-* | m32rle-* \
++	| k1om-* \
 +	| le32-* | le64-* \
 +	| lm32-* \
 +	| m32c-* | m32r-* | m32rle-* \
@@ -2099,8 +2195,10 @@ index ba33103..9633db7 100755
 +	| mips64vr5900-* | mips64vr5900el-* \
  	| mipsisa32-* | mipsisa32el-* \
  	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa32r6-* | mipsisa32r6el-* \
  	| mipsisa64-* | mipsisa64el-* \
  	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64r6-* | mipsisa64r6el-* \
  	| mipsisa64sb1-* | mipsisa64sb1el-* \
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 +	| mipsr5900-* | mipsr5900el-* \
@@ -2113,6 +2211,7 @@ index ba33103..9633db7 100755
 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 +	| none-* | np1-* | ns16k-* | ns32k-* \
 +	| open8-* \
++	| or1k*-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
@@ -2152,7 +2251,7 @@ index ba33103..9633db7 100755
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -363,7 +456,7 @@ case $basic_machine in
+@@ -363,7 +462,7 @@ case $basic_machine in
  		basic_machine=a29k-amd
  		os=-udi
  		;;
@@ -2161,7 +2260,7 @@ index ba33103..9633db7 100755
  		basic_machine=abacus-unknown
  		;;
  	adobe68k)
-@@ -409,6 +502,10 @@ case $basic_machine in
+@@ -409,6 +508,10 @@ case $basic_machine in
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -2172,7 +2271,7 @@ index ba33103..9633db7 100755
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -417,10 +514,35 @@ case $basic_machine in
+@@ -417,10 +520,35 @@ case $basic_machine in
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -2208,7 +2307,7 @@ index ba33103..9633db7 100755
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -445,13 +567,20 @@ case $basic_machine in
+@@ -445,13 +573,20 @@ case $basic_machine in
  		basic_machine=j90-cray
  		os=-unicos
  		;;
@@ -2231,7 +2330,7 @@ index ba33103..9633db7 100755
  	cris | cris-* | etrax*)
  		basic_machine=cris-axis
  		;;
-@@ -481,6 +610,14 @@ case $basic_machine in
+@@ -481,6 +616,14 @@ case $basic_machine in
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -2246,7 +2345,7 @@ index ba33103..9633db7 100755
  	dpx20 | dpx20-*)
  		basic_machine=rs6000-bull
  		os=-bosx
-@@ -592,7 +729,6 @@ case $basic_machine in
+@@ -592,7 +735,6 @@ case $basic_machine in
  	i370-ibm* | ibm*)
  		basic_machine=i370-ibm
  		;;
@@ -2254,7 +2353,7 @@ index ba33103..9633db7 100755
  	i*86v32)
  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
  		os=-sysv32
-@@ -631,6 +767,14 @@ case $basic_machine in
+@@ -631,6 +773,14 @@ case $basic_machine in
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -2269,7 +2368,7 @@ index ba33103..9633db7 100755
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -642,10 +786,21 @@ case $basic_machine in
+@@ -642,10 +792,21 @@ case $basic_machine in
  		basic_machine=ns32k-utek
  		os=-sysv
  		;;
@@ -2292,7 +2391,7 @@ index ba33103..9633db7 100755
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -659,10 +814,6 @@ case $basic_machine in
+@@ -659,10 +820,6 @@ case $basic_machine in
  	mips3*)
  		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
  		;;
@@ -2303,7 +2402,7 @@ index ba33103..9633db7 100755
  	monitor)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -675,10 +826,21 @@ case $basic_machine in
+@@ -675,10 +832,21 @@ case $basic_machine in
  		basic_machine=i386-pc
  		os=-msdos
  		;;
@@ -2325,7 +2424,7 @@ index ba33103..9633db7 100755
  	ncr3000)
  		basic_machine=i486-ncr
  		os=-sysv4
-@@ -743,9 +905,11 @@ case $basic_machine in
+@@ -743,9 +911,11 @@ case $basic_machine in
  	np1)
  		basic_machine=np1-gould
  		;;
@@ -2340,7 +2439,7 @@ index ba33103..9633db7 100755
  		;;
  	nsr-tandem)
  		basic_machine=nsr-tandem
-@@ -754,9 +918,8 @@ case $basic_machine in
+@@ -754,9 +924,8 @@ case $basic_machine in
  		basic_machine=hppa1.1-oki
  		os=-proelf
  		;;
@@ -2351,7 +2450,7 @@ index ba33103..9633db7 100755
  		;;
  	os400)
  		basic_machine=powerpc-ibm
-@@ -778,6 +941,14 @@ case $basic_machine in
+@@ -778,6 +947,14 @@ case $basic_machine in
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -2366,7 +2465,7 @@ index ba33103..9633db7 100755
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -787,6 +958,12 @@ case $basic_machine in
+@@ -787,6 +964,12 @@ case $basic_machine in
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -2379,7 +2478,7 @@ index ba33103..9633db7 100755
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -816,9 +993,10 @@ case $basic_machine in
+@@ -816,9 +999,10 @@ case $basic_machine in
  		;;
  	power)	basic_machine=power-ibm
  		;;
@@ -2392,7 +2491,7 @@ index ba33103..9633db7 100755
  		;;
  	ppcle | powerpclittle | ppc-le | powerpc-little)
  		basic_machine=powerpcle-unknown
-@@ -843,6 +1021,14 @@ case $basic_machine in
+@@ -843,6 +1027,14 @@ case $basic_machine in
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -2407,7 +2506,7 @@ index ba33103..9633db7 100755
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -869,6 +1055,10 @@ case $basic_machine in
+@@ -869,6 +1061,10 @@ case $basic_machine in
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -2418,7 +2517,7 @@ index ba33103..9633db7 100755
  	sei)
  		basic_machine=mips-sei
  		os=-seiux
-@@ -880,6 +1070,9 @@ case $basic_machine in
+@@ -880,6 +1076,9 @@ case $basic_machine in
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -2428,7 +2527,7 @@ index ba33103..9633db7 100755
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -901,6 +1094,9 @@ case $basic_machine in
+@@ -901,6 +1100,9 @@ case $basic_machine in
  		basic_machine=i860-stratus
  		os=-sysv4
  		;;
@@ -2438,7 +2537,7 @@ index ba33103..9633db7 100755
  	sun2)
  		basic_machine=m68000-sun
  		;;
-@@ -957,17 +1153,9 @@ case $basic_machine in
+@@ -957,17 +1159,9 @@ case $basic_machine in
  		basic_machine=t90-cray
  		os=-unicos
  		;;
@@ -2459,7 +2558,7 @@ index ba33103..9633db7 100755
  		;;
  	tx39)
  		basic_machine=mipstx39-unknown
-@@ -1029,9 +1217,16 @@ case $basic_machine in
+@@ -1029,9 +1223,16 @@ case $basic_machine in
  		basic_machine=hppa1.1-winbond
  		os=-proelf
  		;;
@@ -2476,7 +2575,7 @@ index ba33103..9633db7 100755
  	ymp)
  		basic_machine=ymp-cray
  		os=-unicos
-@@ -1040,6 +1235,10 @@ case $basic_machine in
+@@ -1040,6 +1241,10 @@ case $basic_machine in
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -2487,7 +2586,7 @@ index ba33103..9633db7 100755
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1059,6 +1258,9 @@ case $basic_machine in
+@@ -1059,6 +1264,9 @@ case $basic_machine in
  	romp)
  		basic_machine=romp-ibm
  		;;
@@ -2497,7 +2596,7 @@ index ba33103..9633db7 100755
  	rs6000)
  		basic_machine=rs6000-ibm
  		;;
-@@ -1075,13 +1277,10 @@ case $basic_machine in
+@@ -1075,13 +1283,10 @@ case $basic_machine in
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -2513,7 +2612,7 @@ index ba33103..9633db7 100755
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1125,9 +1324,12 @@ esac
+@@ -1125,9 +1330,12 @@ esac
  if [ x"$os" != x"" ]
  then
  case $os in
@@ -2528,7 +2627,7 @@ index ba33103..9633db7 100755
  	-solaris1 | -solaris1.*)
  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
  		;;
-@@ -1148,26 +1350,31 @@ case $os in
+@@ -1148,26 +1356,31 @@ case $os in
  	# 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* \
@@ -2564,11 +2663,11 @@ index ba33103..9633db7 100755
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 -	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 +	      | -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*)
-@@ -1185,7 +1392,7 @@ case $os in
+@@ -1185,7 +1398,7 @@ case $os in
  		os=`echo $os | sed -e 's|nto|nto-qnx|'`
  		;;
  	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
@@ -2577,7 +2676,7 @@ index ba33103..9633db7 100755
  	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
  		;;
  	-mac*)
-@@ -1206,7 +1413,7 @@ case $os in
+@@ -1206,7 +1419,7 @@ case $os in
  	-opened*)
  		os=-openedition
  		;;
@@ -2586,7 +2685,7 @@ index ba33103..9633db7 100755
  		os=-os400
  		;;
  	-wince*)
-@@ -1255,7 +1462,7 @@ case $os in
+@@ -1255,7 +1468,7 @@ case $os in
  	-sinix*)
  		os=-sysv4
  		;;
@@ -2595,7 +2694,7 @@ index ba33103..9633db7 100755
  		os=-tpf
  		;;
  	-triton*)
-@@ -1291,8 +1498,13 @@ case $os in
+@@ -1291,8 +1504,13 @@ case $os in
  	-aros*)
  		os=-aros
  		;;
@@ -2611,7 +2710,7 @@ index ba33103..9633db7 100755
  		;;
  	-none)
  		;;
-@@ -1316,6 +1528,12 @@ else
+@@ -1316,6 +1534,12 @@ else
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -2624,7 +2723,7 @@ index ba33103..9633db7 100755
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1325,9 +1543,24 @@ case $basic_machine in
+@@ -1325,9 +1549,24 @@ case $basic_machine in
  	arm*-semi)
  		os=-aout
  		;;
@@ -2652,7 +2751,7 @@ index ba33103..9633db7 100755
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1346,19 +1579,22 @@ case $basic_machine in
+@@ -1346,13 +1585,13 @@ case $basic_machine in
  		;;
  	m68000-sun)
  		os=-sunos3
@@ -2669,16 +2768,7 @@ index ba33103..9633db7 100755
  	mips*-cisco)
  		os=-elf
  		;;
- 	mips*-*)
- 		os=-elf
- 		;;
-+	or1k-*)
-+		os=-elf
-+		;;
- 	or32-*)
- 		os=-coff
- 		;;
-@@ -1371,9 +1607,15 @@ case $basic_machine in
+@@ -1371,9 +1610,15 @@ case $basic_machine in
  	*-be)
  		os=-beos
  		;;
@@ -2694,7 +2784,7 @@ index ba33103..9633db7 100755
  	*-wec)
  		os=-proelf
  		;;
-@@ -1476,7 +1718,7 @@ case $basic_machine in
+@@ -1476,7 +1721,7 @@ case $basic_machine in
  			-sunos*)
  				vendor=sun
  				;;
@@ -2703,7 +2793,7 @@ index ba33103..9633db7 100755
  				vendor=ibm
  				;;
  			-beos*)
-@@ -1539,7 +1781,7 @@ case $basic_machine in
+@@ -1539,7 +1784,7 @@ case $basic_machine in
  esac
  
  echo $basic_machine$os