1.1 --- a/scripts/config.guess	Wed Sep 26 00:53:29 2012 +0200
     1.2 +++ b/scripts/config.guess	Tue Sep 25 23:23:53 2012 +0200
     1.3 @@ -4,7 +4,7 @@
     1.4  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     1.5  #   2011, 2012 Free Software Foundation, Inc.
     1.6  
     1.7 -timestamp='2012-07-31'
     1.8 +timestamp='2012-09-25'
     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 @@ -306,7 +306,7 @@
    1.13      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
    1.14  	echo arm-acorn-riscix${UNAME_RELEASE}
    1.15  	exit ;;
    1.16 -    arm:riscos:*:*|arm:RISCOS:*:*)
    1.17 +    arm*:riscos:*:*|arm*:RISCOS:*:*)
    1.18  	echo arm-unknown-riscos
    1.19  	exit ;;
    1.20      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
    1.21 @@ -1208,6 +1208,9 @@
    1.22      BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
    1.23  	echo i586-pc-haiku
    1.24  	exit ;;
    1.25 +    x86_64:Haiku:*:*)
    1.26 +	echo x86_64-unknown-haiku
    1.27 +	exit ;;
    1.28      SX-4:SUPER-UX:*:*)
    1.29  	echo sx4-nec-superux${UNAME_RELEASE}
    1.30  	exit ;;

     2.1 --- a/scripts/config.sub	Wed Sep 26 00:53:29 2012 +0200
     2.2 +++ b/scripts/config.sub	Tue Sep 25 23:23:53 2012 +0200
     2.3 @@ -4,7 +4,7 @@
     2.4  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
     2.5  #   2011, 2012 Free Software Foundation, Inc.
     2.6  
     2.7 -timestamp='2012-07-31'
     2.8 +timestamp='2012-08-18'
     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 @@ -123,7 +123,7 @@
    2.13  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    2.14  case $maybe_os in
    2.15    nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
    2.16 -  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
    2.17 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
    2.18    knetbsd*-gnu* | netbsd*-gnu* | \
    2.19    kopensolaris*-gnu* | \
    2.20    storm-chaos* | os2-emx* | rtmk-nova*)
    2.21 @@ -1364,7 +1364,7 @@
    2.22  	      | -chorusos* | -chorusrdb* | -cegcc* \
    2.23  	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    2.24  	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
    2.25 -	      | -linux-newlib* | -linux-uclibc* \
    2.26 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
    2.27  	      | -uxpv* | -beos* | -mpeix* | -udk* \
    2.28  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    2.29  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \