diff -Nru autotools-dev-20130810.1/ChangeLog autotools-dev-20140510.1/ChangeLog
--- autotools-dev-20130810.1/ChangeLog	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/ChangeLog	2014-05-10 21:04:52.000000000 +0000
@@ -1,3 +1,101 @@
+2014-05-01  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.data: Add test cases for mipsisa*r6.
+
+2014-05-01  Chao-ying Fu  <chao-ying.fu@imgtec.com>
+	    Matthew Fortune  <matthew.fortune@imgtec.com>
+	    Andrew Bennett  <andrew.bennett@imgtec.com>
+
+	* config.sub (mipsisa32r6, mipsisa64r6): New.
+
+2014-04-03  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.data: Sort.
+
+2014-04-03  Ashish Kapania  <akapania@ti.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (-tirtos*): New.
+	* testsuite/config-sub.data: Add a test case.
+
+2014-04-03  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config-sub.sh (run_config-sub): Quote some variables
+	to avoid spurious shell errors when a test case fails.
+
+2014-03-23  Christian Svensson  <blue@cmd.nu>
+
+	* config.guess (openrisc:Linux:*:*): New.
+	* config.guess (or1k*:Linux:*:*): Modified for or1knd.
+	* config.sub (or1knd): New.
+	* testsuite/config-guess.data: Test for or1knd:Linux, openrisc:Linux.
+	* testsuite/config-sub.data: Tests for or1knd-linux, or1knd-elf,
+	or1knd and or1k.
+
+2014-03-13  Ben Elliston  <bje@gnu.org>
+
+	Reported by Dejan Lekic <dejan.lekic@gmail.com>.
+	* config.guess (*:MSYS*:*): Match all machines, not just i*.
+	* testsuite/config-guess.data: Add a test case.
+
+2014-02-12  Urs Janssen  <urs@akk.org>
+
+	* config.guess (Linux|GNU|GNU/*): Strip extraneous whitespace
+	inserted by the preprocessor (eg, pgcc -E).
+
+2014-01-25  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Remove check for /usr/apollo directory.
+
+2014-01-25  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Remove the C program that detects ancient
+	operating systems without using uname(1).
+
+2014-01-25  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (arm-acorn-riscix, m68k-hp-bsd, i860-alliant-bsd)
+	(i386-pc-bsd, i386-sequent-ptx, i386-sequent-dynix)
+	(n32k-sequent-dynix, m68k-sony-newsos, mips-sony-bsd)
+	(ns32k-encore-sysv, ns32k-encore-mach, ns32k-encore-bsd)
+	(<arch>-next-nextstep, <arch>-next-openstep, vax-dec-bsd4.3)
+	(vax-dec-bsd4.3reno, vax-dec-bsd, vax-dec-ultrix): Remove from the
+	C program.
+
+2014-01-25  Ben Elliston  <bje@gnu.org>
+
+	* config.guess (c1-convex-bsd, c32-convex-bsd, c2-convex-bsd)
+	(c34-convex-bsd, c38-convex-bsd, c4-convex-bsd): Remove Convex
+	triplets that are not handled inside the case statement.
+
+2014-01-01  Ben Elliston  <bje@gnu.org>
+
+	* testsuite/config.guess: Sort.
+	* testsuite/config.sub: Ditto.
+
+2014-01-01  Ben Elliston  <bje@gnu.org>
+
+	* config.guess: Update copyright years.
+	* config.sub: Likewise.
+
+2013-11-28  Adam Maxwell <amaxwell@mac.com>
+
+	* config.guess (*:Darwin:*:*): Avoid executing `cc' on OS X 10.9,
+	as it ships with a stub that puts up a graphical alert prompting
+	the user to install developer tools.
+
+2013-10-01  Ben Elliston  <bje@gnu.org>
+
+	Reported by Jö Fahlke <jorrit@jorrit.de>.
+	* config.sub (k1om, k1om-*): New.
+	* testsuite/config-sub.data: Add test cases.
+
+2013-09-05  Nathan Sidwell  <nathan@codesourcery.com>
+	    Ben Elliston  <bje@gnu.org>
+
+	* config.sub (nvptx): New.
+	* testsuite/config-sub.data: Add test cases.
+
 2013-08-10  Earnie Boyd  <earnie@users.sourceforge.net>
 	    Ben Elliston  <bje@gnu.org>
 
diff -Nru autotools-dev-20130810.1/config.guess autotools-dev-20140510.1/config.guess
--- autotools-dev-20130810.1/config.guess	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/config.guess	2014-05-10 21:04:52.000000000 +0000
@@ -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-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
@@ -50,7 +50,7 @@
 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."
@@ -149,7 +149,7 @@
 	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
 
@@ -826,7 +826,7 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -969,10 +969,10 @@
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    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:*:*)
@@ -1260,16 +1260,26 @@
 	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 ;;
@@ -1361,154 +1371,6 @@
 	exit ;;
 esac
 
-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"
-#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 <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 && 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 <<EOF
 $0: unable to guess system type
 
diff -Nru autotools-dev-20130810.1/config.sub autotools-dev-20140510.1/config.sub
--- autotools-dev-20130810.1/config.sub	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/config.sub	2014-05-10 21:04:52.000000000 +0000
@@ -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-08-10'
+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 @@
 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."
@@ -265,6 +265,7 @@
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
@@ -282,8 +283,10 @@
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipsr5900 | mipsr5900el \
@@ -295,8 +298,7 @@
 	| 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 @@
 	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
 		;;
@@ -381,6 +383,7 @@
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
@@ -400,8 +403,10 @@
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipsr5900-* | mipsr5900el-* \
@@ -413,6 +418,7 @@
 	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -1374,7 +1380,7 @@
 	      | -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*)
@@ -1592,9 +1598,6 @@
 	mips*-*)
 		os=-elf
 		;;
-	or1k-*)
-		os=-elf
-		;;
 	or32-*)
 		os=-coff
 		;;
diff -Nru autotools-dev-20130810.1/debian/changelog autotools-dev-20140510.1/debian/changelog
--- autotools-dev-20130810.1/debian/changelog	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/debian/changelog	2014-05-10 21:04:52.000000000 +0000
@@ -1,3 +1,11 @@
+autotools-dev (20140510.1) unstable; urgency=low
+
+  * Sync to upstream git 2014-05-10
+    [commit 5049811e672698aa2337bb27ede94e54c9174154]
+    + Updates for some embedded Linux platforms such as openrisc/or1k
+
+ -- Henrique de Moraes Holschuh <hmh@debian.org>  Sat, 10 May 2014 18:02:55 -0300
+
 autotools-dev (20130810.1) unstable; urgency=low
 
   * Sync to upstream git 2013-08-10 (closes: #719272)
diff -Nru autotools-dev-20130810.1/testsuite/config-guess.data autotools-dev-20140510.1/testsuite/config-guess.data
--- autotools-dev-20130810.1/testsuite/config-guess.data	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/testsuite/config-guess.data	2014-05-10 21:04:52.000000000 +0000
@@ -1,11 +1,11 @@
 2064	ignored			z/VM		ignored	s390-ibm-zvmoe
 3	2.3.3			XENIX		SysV	i386-pc-xenix
 8664	1.0			Windows_NT	ignored	x86_64-pc-mks
-aarch64	ignored			Linux		ignored aarch64-unknown-linux-gnu
 aarch64_be	ignored		Linux		ignored aarch64_be-unknown-linux-gnu
+aarch64	ignored			Linux		ignored aarch64-unknown-linux-gnu
 amd64	1.5.12(0.116/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
-arc	ignored			Linux		ignored	arc-unknown-linux-gnu
 arceb	ignored			Linux		ignored	arceb-unknown-linux-gnu
+arc	ignored			Linux		ignored	arc-unknown-linux-gnu
 arm	ignored			riscos		ignored	arm-unknown-riscos
 arm	ignored			RISCOS		ignored	arm-unknown-riscos
 armv4l	ignored			riscos		ignored	arm-unknown-riscos
@@ -38,7 +38,9 @@
 NSE-1	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 NSE-N	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
 NSE-NN	1.0			NONSTOP_KERNEL	ignored	nse-tandem-nsk1.0
+openrisc	ignored		Linux		ignored	or1k-unknown-linux-gnu
 or1k	ignored			Linux		ignored	or1k-unknown-linux-gnu
+or1knd	ignored			Linux		ignored	or1knd-unknown-linux-gnu
 or32	ignored			Linux		ignored	or32-unknown-linux-gnu
 padre	2.6.15			Linux		ignored	sparc-unknown-linux-gnu
 pc	1.0			ignored		ignored	i586-pc-msdosdjgpp
@@ -54,10 +56,11 @@
 vax	2.6.15			Linux		ignored	vax-dec-linux-gnu
 x86	5.2			Interix		ignored	i586-pc-interix5.2
 x86	6.0			Interix		ignored	i586-pc-interix6.0
-x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
+x86_64	1.0			Haiku		ignored	x86_64-unknown-haiku
 x86_64	1.0			MINGW64		ignored	x86_64-pc-mingw64
+x86_64	1.0			MINGW		ignored	x86_64-pc-mingw32
+x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
+x86_64	2.0.0(0.271/5/3)	MSYS_NT-6.1	ignored	x86_64-pc-msys
 x86_64	2.6.32			Linux		ignored	x86_64-unknown-linux-gnu
 x86_64	2.6.32			VMkernel	ignored	x86_64-unknown-esx
-x86_64	1.5.18(0.132/4/2)	CYGWIN_NT-5.2	ignored	x86_64-unknown-cygwin
-x86_64	1.0			Haiku		ignored	x86_64-unknown-haiku
 xtensa	2.6.15			Linux		ignored	xtensa-unknown-linux-gnu
diff -Nru autotools-dev-20130810.1/testsuite/config-sub.data autotools-dev-20140510.1/testsuite/config-sub.data
--- autotools-dev-20130810.1/testsuite/config-sub.data	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/testsuite/config-sub.data	2014-05-10 21:04:52.000000000 +0000
@@ -1,22 +1,23 @@
-aarch64-elf			aarch64-unknown-elf
-aarch64-linux			aarch64-unknown-linux-gnu
-aarch64-unknown-elf		aarch64-unknown-elf
-aarch64-unknown-linux		aarch64-unknown-linux-gnu
 aarch64_be-elf			aarch64_be-unknown-elf
 aarch64_be-linux		aarch64_be-unknown-linux-gnu
 aarch64_be-unknown-elf		aarch64_be-unknown-elf
 aarch64_be-unknown-linux	aarch64_be-unknown-linux-gnu
+aarch64-elf			aarch64-unknown-elf
+aarch64-linux			aarch64-unknown-linux-gnu
+aarch64-unknown-elf		aarch64-unknown-elf
+aarch64-unknown-linux		aarch64-unknown-linux-gnu
 amd64-cygwin			x86_64-pc-cygwin
 amd64-kfreebsd5.4-gnu		x86_64-pc-kfreebsd5.4-gnu
 amd64-unknown-freebsd5.2	x86_64-unknown-freebsd5.2
-arc-linux			arc-unknown-linux-gnu
 arceb-linux			arceb-unknown-linux-gnu
+arc-linux			arc-unknown-linux-gnu
 arm-cegcc			arm-unknown-cegcc
 arm-coff			arm-unknown-coff
 arm-elf				arm-unknown-elf
 arm-linux-androideabi		arm-unknown-linux-androideabi
 arm-mingw32ce			arm-unknown-mingw32ce
 arm-riscos			arm-unknown-riscos
+arm-tirtos			arm-unknown-tirtos
 arm-unknown-riscos		arm-unknown-riscos
 armv6-linux-gnu			armv6-unknown-linux-gnu
 armv7a-linux-gnueabi		armv7a-unknown-linux-gnueabi
@@ -54,13 +55,13 @@
 crisv32-linux			crisv32-axis-linux-gnu
 dicos				i686-pc-dicos
 djgpp				i586-pc-msdosdjgpp
-epiphany			epiphany-unknown-none
 epiphany-elf			epiphany-unknown-elf
+epiphany			epiphany-unknown-none
 fido-elf			fido-unknown-elf
 fido				fido-unknown-none
 frv-linux			frv-unknown-linux-gnu
-hexagon-linux			hexagon-unknown-linux-gnu
 hexagon				hexagon-unknown-elf
+hexagon-linux			hexagon-unknown-linux-gnu
 i386-aros			i386-pc-aros
 i386-bitrig			i386-pc-bitrig
 i386-drops1.0			i386-pc-drops1.0
@@ -69,8 +70,8 @@
 i386-freebsd			i386-pc-freebsd
 i386-haiku			i386-pc-haiku
 i386-linux			i386-pc-linux-gnu
-i386-linux-newlib		i386-pc-linux-newlib
 i386-linux-musl			i386-pc-linux-musl
+i386-linux-newlib		i386-pc-linux-newlib
 i386-mingw32			i386-pc-mingw32
 i386-msys			i386-pc-msys
 i386-netbsd			i386-pc-netbsd
@@ -79,6 +80,7 @@
 i386-pc-nacl			i386-pc-nacl
 i386-pc-sco5v6			i386-pc-sco5v6
 i386-pc-sco6			i386-pc-sco5v6
+i386-plan9			i386-pc-plan9
 i386-solidbsd			i386-pc-solidbsd
 i486-elf			i486-pc-elf
 i586-auroraux5.0		i586-pc-auroraux5.0
@@ -93,6 +95,8 @@
 i686-kopensolaris5.11-gnu	i686-pc-kopensolaris5.11-gnu
 i786-elf			i786-pc-elf
 ibm				i370-ibm-aix
+k1om				k1om-unknown-none
+k1om-linux			k1om-unknown-linux-gnu
 le32-nacl			le32-unknown-nacl
 le64-none			le64-unknown-none
 lm32-elf			lm32-unknown-elf
@@ -107,14 +111,14 @@
 mep				mep-unknown-elf
 metag-linux			metag-unknown-linux-gnu
 metag				metag-unknown-none
-microblaze-elf			microblaze-unknown-elf
 microblazeel-elf		microblazeel-unknown-elf
-microblaze-linux		microblaze-unknown-linux-gnu
+microblaze-elf			microblaze-unknown-elf
 microblazeel-linux		microblazeel-unknown-linux-gnu
-microblaze			microblaze-unknown-none
 microblazeel			microblazeel-unknown-none
-mingw32				i686-pc-mingw32
+microblaze-linux		microblaze-unknown-linux-gnu
+microblaze			microblaze-unknown-none
 mingw32ce			arm-unknown-mingw32ce
+mingw32				i686-pc-mingw32
 mingw64				x86_64-pc-mingw64
 mips64octeonel-elf		mips64octeonel-unknown-elf
 mips64octeon-elf		mips64octeon-unknown-elf
@@ -128,15 +132,19 @@
 mips64vr5900-elf		mips64vr5900-unknown-elf
 mips64vr5900el			mips64vr5900el-unknown-elf
 mips64vr5900			mips64vr5900-unknown-elf
-mipsr5900			mipsr5900-unknown-elf
+mipsisa32r6-elf			mipsisa32r6-unknown-elf
+mipsisa32r6el-elf		mipsisa32r6el-unknown-elf
+mipsisa64r6-elf			mipsisa64r6-unknown-elf
+mipsisa64r6el-elf		mipsisa64r6el-unknown-elf
 mipsr5900el			mipsr5900el-unknown-elf
+mipsr5900			mipsr5900-unknown-elf
 mips-sde-elf			mips-sde-elf
 mmix-elf			mmix-knuth-elf
 mmix				mmix-knuth-mmixware
-msys				i686-pc-msys
 moxie-elf			moxie-unknown-elf
 ms1-elf				mt-unknown-elf
 ms1				mt-unknown-none
+msys				i686-pc-msys
 mt-elf				mt-unknown-elf
 mt				mt-unknown-none
 nacl				le32-unknown-nacl
@@ -144,19 +152,33 @@
 nds32le-elf			nds32le-unknown-elf
 nds32le				nds32le-unknown-none
 nds32				nds32-unknown-none
-nios2-elf			nios2-unknown-elf
-nios2				nios2-unknown-none
 nios2eb-elf			nios2eb-unknown-elf
 nios2eb				nios2eb-unknown-none
 nios2el-elf			nios2el-unknown-elf
+nios2-elf			nios2-unknown-elf
 nios2el				nios2el-unknown-none
+nios2				nios2-unknown-none
 nios-elf			nios-unknown-elf
 nios				nios-unknown-none
+nvptx				nvptx-unknown-none
 open8-elf			open8-unknown-elf
 open8				open8-unknown-none
 openrisc-linux			or32-unknown-linux-gnu
+or1k64-unknown-linux		or1k64-unknown-linux-gnu
+or1k-company-elf		or1k-company-elf
+or1k-company-linux		or1k-company-linux-gnu
 or1k-elf			or1k-unknown-elf
+or1k-linux-gnu			or1k-unknown-linux-gnu
 or1k-linux			or1k-unknown-linux-gnu
+or1k-linux-uclibc		or1k-unknown-linux-uclibc
+or1knd-company-elf		or1knd-company-elf
+or1knd-company-linux		or1knd-company-linux-gnu
+or1knd-elf			or1knd-unknown-elf
+or1knd-linux-gnu		or1knd-unknown-linux-gnu
+or1knd-linux			or1knd-unknown-linux-gnu
+or1knd-linux-uclibc		or1knd-unknown-linux-uclibc
+or1knd				or1knd-unknown-none
+or1k				or1k-unknown-none
 or32-linux			or32-unknown-linux-gnu
 os400				powerpc-ibm-os400
 parisc				hppa-unknown-linux-gnu
@@ -164,10 +186,10 @@
 picochip			picochip-unknown-none
 powerpc-bluegene		powerpc-ibm-cnk
 powerpc-cnk			powerpc-ibm-cnk
-powerpc-elf-lynxos		powerpc-elf-lynxos
 powerpc-elf-lynxos5		powerpc-elf-lynxos5
-powerpc-xcoff-lynxos178		powerpc-xcoff-lynxos178
+powerpc-elf-lynxos		powerpc-elf-lynxos
 powerpc-haiku			powerpc-unknown-haiku
+powerpc-xcoff-lynxos178		powerpc-xcoff-lynxos178
 ppcbe-elf			powerpc-unknown-elf
 ppcbe-none-elf			powerpc-none-elf
 ppcbe				powerpc-unknown-none
@@ -177,9 +199,9 @@
 ppcle				powerpcle-unknown-none
 ppc-none-elf			powerpc-none-elf
 ppc				powerpc-unknown-none
-rdos				x86_64-pc-rdos
 rdos32				i386-pc-rdos
 rdos64				x86_64-pc-rdos
+rdos				x86_64-pc-rdos
 rl78-linux			rl78-unknown-linux-gnu
 rl78				rl78-unknown-none
 rx-linux			rx-unknown-linux-gnu
@@ -280,4 +302,3 @@
 xtensa-elf			xtensa-unknown-elf
 xtensa-linux			xtensa-unknown-linux-gnu
 z80-coff			z80-unknown-coff
-i386-plan9			i386-pc-plan9
diff -Nru autotools-dev-20130810.1/testsuite/config-sub.sh autotools-dev-20140510.1/testsuite/config-sub.sh
--- autotools-dev-20130810.1/testsuite/config-sub.sh	2013-08-10 12:26:10.000000000 +0000
+++ autotools-dev-20140510.1/testsuite/config-sub.sh	2014-05-10 21:04:52.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright 2004, 2005, 2009 Free Software Foundation, Inc.
+# Copyright 2004, 2005, 2009, 2014 Free Software Foundation, Inc.
 # Contributed by Ben Elliston <bje@gnu.org>.
 #
 # This test reads pairs from config-sub.data: an alias and its
@@ -14,7 +14,7 @@
     rc=0
     while read alias canonical ; do
 	output=`sh ../config.sub $alias`
-	if test $output != $canonical ; then
+	if test "$output" != "$canonical" ; then
 	    echo "FAIL: $alias -> $output, but expected $canonical"
 	    rc=1
 	else
@@ -27,7 +27,6 @@
 if run_config_sub ; then
     $verbose || echo "PASS: config.sub checks"
 else
-    echo "Unexpected failures."
     exit 1
 fi