michael@0: --- config.sub.orig	2014-03-09 18:34:03 -0700
michael@0: +++ config.sub	2014-03-14 19:49:48 -0700
michael@0: @@ -115,7 +115,7 @@
michael@0:  # Here we must recognize all the valid KERNEL-OS combinations.
michael@0:  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
michael@0:  case $maybe_os in
michael@0: -  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
michael@0: +  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | \
michael@0:    linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
michael@0:    knetbsd*-gnu* | netbsd*-gnu* | \
michael@0:    kopensolaris*-gnu* | \
michael@0: @@ -123,10 +123,6 @@
michael@0:      os=-$maybe_os
michael@0:      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
michael@0:      ;;
michael@0: -  android-linux)
michael@0: -    os=-linux-android
michael@0: -    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
michael@0: -    ;;
michael@0:    *)
michael@0:      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
michael@0:      if [ $basic_machine != $1 ]
michael@0: @@ -1367,7 +1363,7 @@
michael@0:  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
michael@0:  	      | -chorusos* | -chorusrdb* | -cegcc* \
michael@0:  	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
michael@0: -	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
michael@0: +	      | -mingw32* | -mingw64* | -linux-gnu* \
michael@0:  	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
michael@0:  	      | -uxpv* | -beos* | -mpeix* | -udk* \
michael@0:  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
michael@0: @@ -1508,6 +1504,9 @@
michael@0:  		;;
michael@0:  	-nacl*)
michael@0:  		;;
michael@0: +	-android*)
michael@0: +		os=-android
michael@0: +		;;
michael@0:  	-none)
michael@0:  		;;
michael@0:  	*)
michael@0: @@ -1777,6 +1776,9 @@
michael@0:  			-vos*)
michael@0:  				vendor=stratus
michael@0:  				;;
michael@0: +			*-android*|*-linuxandroid*)
michael@0: +				vendor=linux-
michael@0: +				;;
michael@0:  		esac
michael@0:  		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
michael@0:  		;;