1.1 --- a/scripts/config.guess	Sat Dec 18 23:29:46 2010 +0100
     1.2 +++ b/scripts/config.guess	Sun Jan 30 19:31:51 2011 +0100
     1.3 @@ -1,10 +1,10 @@
     1.4  #! /bin/sh
     1.5  # Attempt to guess a canonical system name.
     1.6  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     1.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
     1.8 -#   Free Software Foundation, Inc.
     1.9 +#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
    1.10 +#   2011 Free Software Foundation, Inc.
    1.11  
    1.12 -timestamp='2010-09-24'
    1.13 +timestamp='2011-01-23'
    1.14  
    1.15  # This file is free software; you can redistribute it and/or modify it
    1.16  # under the terms of the GNU General Public License as published by
    1.17 @@ -57,7 +57,7 @@
    1.18  
    1.19  Originally written by Per Bothner.
    1.20  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
    1.21 -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
    1.22 +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free
    1.23  Software Foundation, Inc.
    1.24  
    1.25  This is free software; see the source for copying conditions.  There is NO
    1.26 @@ -92,7 +92,7 @@
    1.27    exit 1
    1.28  fi
    1.29  
    1.30 -trap 'exit 1' HUP INT TERM
    1.31 +trap 'exit 1' 1 2 15
    1.32  
    1.33  # CC_FOR_BUILD -- compiler used by this script. Note that the use of a
    1.34  # compiler to aid in system detection is discouraged as it requires
    1.35 @@ -106,7 +106,7 @@
    1.36  
    1.37  set_cc_for_build='
    1.38  trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
    1.39 -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
    1.40 +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    1.41  : ${TMPDIR=/tmp} ;
    1.42   { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    1.43   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    1.44 @@ -270,7 +270,10 @@
    1.45  	# A Xn.n version is an unreleased experimental baselevel.
    1.46  	# 1.2 uses "1.2" for uname -r.
    1.47  	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
    1.48 -	exit ;;
    1.49 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
    1.50 +	exitcode=$?
    1.51 +	trap '' 0
    1.52 +	exit $exitcode ;;
    1.53      Alpha\ *:Windows_NT*:*)
    1.54  	# How do we know it's Interix rather than the generic POSIX subsystem?
    1.55  	# Should we change UNAME_MACHINE based on the output of uname instead