1.1 --- a/scripts/config.guess	Wed Dec 14 19:57:47 2011 +0100
     1.2 +++ b/scripts/config.guess	Fri Dec 30 14:15:43 2011 +0100
     1.3 @@ -4,7 +4,7 @@
     1.4  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     1.5  #   2011 Free Software Foundation, Inc.
     1.6  
     1.7 -timestamp='2011-10-01'
     1.8 +timestamp='2011-12-29'
     1.9  
    1.10  # This file is free software; you can redistribute it and/or modify it
    1.11  # under the terms of the GNU General Public License as published by
    1.12 @@ -806,6 +806,9 @@
    1.13      *:MINGW*:*)
    1.14  	echo ${UNAME_MACHINE}-pc-mingw32
    1.15  	exit ;;
    1.16 +    i*:MSYS*:*)
    1.17 +	echo ${UNAME_MACHINE}-pc-msys
    1.18 +	exit ;;
    1.19      i*:windows32*:*)
    1.20  	# uname -m includes "-pc" on this system.
    1.21  	echo ${UNAME_MACHINE}-mingw32
    1.22 @@ -894,16 +897,16 @@
    1.23  	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.24  	exit ;;
    1.25      cris:Linux:*:*)
    1.26 -	echo cris-axis-linux-gnu
    1.27 +	echo ${UNAME_MACHINE}-axis-linux-gnu
    1.28  	exit ;;
    1.29      crisv32:Linux:*:*)
    1.30 -	echo crisv32-axis-linux-gnu
    1.31 +	echo ${UNAME_MACHINE}-axis-linux-gnu
    1.32  	exit ;;
    1.33      frv:Linux:*:*)
    1.34 -	echo frv-unknown-linux-gnu
    1.35 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.36  	exit ;;
    1.37      hexagon:Linux:*:*)
    1.38 -	echo hexagon-unknown-linux-gnu
    1.39 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.40  	exit ;;
    1.41      i*86:Linux:*:*)
    1.42  	LIBC=gnu
    1.43 @@ -945,7 +948,7 @@
    1.44  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    1.45  	;;
    1.46      or32:Linux:*:*)
    1.47 -	echo or32-unknown-linux-gnu
    1.48 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.49  	exit ;;
    1.50      padre:Linux:*:*)
    1.51  	echo sparc-unknown-linux-gnu
    1.52 @@ -986,7 +989,7 @@
    1.53  	echo ${UNAME_MACHINE}-dec-linux-gnu
    1.54  	exit ;;
    1.55      x86_64:Linux:*:*)
    1.56 -	echo x86_64-unknown-linux-gnu
    1.57 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
    1.58  	exit ;;
    1.59      xtensa*:Linux:*:*)
    1.60  	echo ${UNAME_MACHINE}-unknown-linux-gnu

     2.1 --- a/scripts/config.sub	Wed Dec 14 19:57:47 2011 +0100
     2.2 +++ b/scripts/config.sub	Fri Dec 30 14:15:43 2011 +0100
     2.3 @@ -4,7 +4,7 @@
     2.4  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     2.5  #   2011 Free Software Foundation, Inc.
     2.6  
     2.7 -timestamp='2011-09-09'
     2.8 +timestamp='2011-11-11'
     2.9  
    2.10  # This file is (in principle) common to ALL GNU software.
    2.11  # The presence of a machine in this file suggests that SOME GNU software
    2.12 @@ -255,6 +255,7 @@
    2.13  	| bfin \
    2.14  	| c4x | clipper \
    2.15  	| d10v | d30v | dlx | dsp16xx \
    2.16 +	| epiphany \
    2.17  	| fido | fr30 | frv \
    2.18  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
    2.19  	| hexagon \
    2.20 @@ -294,7 +295,7 @@
    2.21  	| pdp10 | pdp11 | pj | pjl \
    2.22  	| powerpc | powerpc64 | powerpc64le | powerpcle \
    2.23  	| pyramid \
    2.24 -	| rx \
    2.25 +	| rl78 | rx \
    2.26  	| score \
    2.27  	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    2.28  	| sh64 | sh64le \
    2.29 @@ -406,7 +407,7 @@
    2.30  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
    2.31  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
    2.32  	| pyramid-* \
    2.33 -	| romp-* | rs6000-* | rx-* \
    2.34 +	| rl78-* | romp-* | rs6000-* | rx-* \
    2.35  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
    2.36  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    2.37  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
    2.38 @@ -815,6 +816,10 @@
    2.39  	ms1-*)
    2.40  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
    2.41  		;;
    2.42 +	msys)
    2.43 +		basic_machine=i386-pc
    2.44 +		os=-msys
    2.45 +		;;
    2.46  	mvs)
    2.47  		basic_machine=i370-ibm
    2.48  		os=-mvs
    2.49 @@ -1342,7 +1347,7 @@
    2.50  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
    2.51  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
    2.52  	      | -chorusos* | -chorusrdb* | -cegcc* \
    2.53 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    2.54 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    2.55  	      | -mingw32* | -linux-gnu* | -linux-android* \
    2.56  	      | -linux-newlib* | -linux-uclibc* \
    2.57  	      | -uxpv* | -beos* | -mpeix* | -udk* \