--- /usr/portage/eclass/toolchain.eclass.orig	2010-04-03 22:35:38.000000000 +0200
+++ /usr/portage/eclass/toolchain.eclass	2010-04-18 18:41:12.000000000 +0200
@@ -1239,7 +1239,11 @@
 				# Remove endian ('l' / 'eb')
 				[[ ${arm_arch} == *l  ]] && arm_arch=${arm_arch%l}
 				[[ ${arm_arch} == *eb ]] && arm_arch=${arm_arch%eb}
-				confgcc+=" --with-arch=${arm_arch}"
+				local arm_arches="armv4 armv4t armv5t armv5te armv6j armv6k armv6m armv6t2 armv6zk armv7a armv7m armv7r"
+				for i in $arm_arches; do
+					[[ ${i} == $arm_arch ]] && \
+						confgcc+=" --with-arch=${arm_arch}"
+				done
 			fi
 			;;
 		# Add --with-abi flags to set default MIPS ABI
