--- gcc-4.6.1.orig/configure	2012-09-24 17:56:00.232164337 +0000
+++ gcc-4.6.1/configure	2012-09-24 18:00:08.820172802 +0000
@@ -3236,7 +3236,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     libgloss_dir=arm
     ;;
-  arm*-*-linux-gnueabi)
+  arm*-*-linux-gnueabi*)
     noconfigdirs="$noconfigdirs target-qthreads"
     case ${with_newlib} in
       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
--- gcc-4.6.1.orig/configure.ac	2012-09-24 17:56:02.312164408 +0000
+++ gcc-4.6.1/configure.ac	2012-09-24 18:01:00.840174573 +0000
@@ -682,7 +682,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
     libgloss_dir=arm
     ;;
-  arm*-*-linux-gnueabi)
+  arm*-*-linux-gnueabi*)
     noconfigdirs="$noconfigdirs target-qthreads"
     case ${with_newlib} in
       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
--- gcc-4.6.1.orig/gcc/config.gcc	2012-09-24 17:56:04.152164470 +0000
+++ gcc-4.6.1/gcc/config.gcc	2012-09-24 18:02:13.052177032 +0000
@@ -822,13 +822,13 @@ arm*-*-linux*)			# ARM GNU/Linux with EL
 	esac
 	tmake_file="${tmake_file} t-linux arm/t-arm"
 	case ${target} in
-	arm*-*-linux-*eabi)
+	arm*-*-linux-*eabi*)
 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
 	    tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
 	    # Define multilib configuration for arm-linux-androideabi.
 	    case ${target} in
-	    *-androideabi)
+	    *-androideabi*)
 		tmake_file="$tmake_file arm/t-linux-androideabi"
 		;;
 	    esac
@@ -850,7 +850,7 @@ arm*-*-uclinux*)		# ARM ucLinux
 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
 	tmake_file="arm/t-arm arm/t-arm-elf"
 	case ${target} in
-	arm*-*-uclinux*eabi)
+	arm*-*-uclinux*eabi*)
 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
 	    tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
 	    tmake_file="$tmake_file arm/t-bpabi"
--- gcc-4.6.1.orig/libstdc++-v3/configure.host	2010-12-06 00:50:04.000000000 +0000
+++ gcc-4.6.1/libstdc++-v3/configure.host	2012-09-24 18:04:28.736181653 +0000
@@ -322,7 +322,7 @@ case "${host}" in
         fi
     esac
     case "${host}" in
-      arm*-*-linux-*eabi)
+      arm*-*-linux-*eabi*)
 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
 	;;
     esac
--- gcc-4.6.1.orig/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2009-04-09 15:00:19.000000000 +0000
+++ gcc-4.6.1/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2012-09-24 18:06:09.996185101 +0000
@@ -1,5 +1,5 @@
 // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
 
 // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
 //
--- gcc-4.6.1.orig/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2009-04-09 15:00:19.000000000 +0000
+++ gcc-4.6.1/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2012-09-24 18:06:19.120185411 +0000
@@ -1,5 +1,5 @@
 // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
+// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi* } }
 
 // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
 //