1 files changed, 6 insertions, 15 deletions

diff --git a/config.guess b/config.guess
index 78553c4ea..c2246a4f7 100755
--- a/config.guess
+++ b/config.guess
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 
-timestamp='2011-01-23'
+timestamp='2009-12-30'
 
 # 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
@@ -57,7 +57,7 @@ GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
 Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
@@ -270,10 +270,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
         # A Xn.n version is an unreleased experimental baselevel.
         # 1.2 uses "1.2" for uname -r.
         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
-        exitcode=$?
-        trap '' 0
-        exit $exitcode ;;
+        exit ;;
     Alpha\ *:Windows_NT*:*)
         # How do we know it's Interix rather than the generic POSIX subsystem?
         # Should we change UNAME_MACHINE based on the output of uname instead
@@ -555,7 +552,7 @@ EOF
                 echo rs6000-ibm-aix3.2
         fi
         exit ;;
-    *:AIX:*:[4567])
+    *:AIX:*:[456])
         IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
                 IBM_ARCH=rs6000
@@ -971,9 +968,6 @@ EOF
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
-    tile*:Linux:*:*)
-        echo ${UNAME_MACHINE}-tilera-linux-gnu
-        exit ;;
     vax:Linux:*:*)
         echo ${UNAME_MACHINE}-dec-linux-gnu
         exit ;;
@@ -1237,9 +1231,6 @@ EOF
     *:QNX:*:4*)
         echo i386-pc-qnx
         exit ;;
-    NEO-?:NONSTOP_KERNEL:*:*)
-        echo neo-tandem-nsk${UNAME_RELEASE}
-        exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
         echo nse-tandem-nsk${UNAME_RELEASE}
         exit ;;