--- /usr/portage/eclass/toolchain.eclass	2009-04-04 12:52:40.000000000 -0400
+++ eclass/toolchain.eclass	2009-04-13 09:31:10.000000000 -0400
@@ -1390,13 +1390,12 @@ gcc_do_configure() {
 	fi
 	[[ ${GCCMAJOR}.${GCCMINOR} < 3.4 ]] && confgcc="${confgcc} --disable-libunwind-exceptions"
 
-	# create a sparc*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
-	if [[ ${CTARGET} == sparc*linux* ]] \
-		&& is_multilib \
-		&& [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]]
-	then
-		confgcc="${confgcc} --enable-targets=all"
-	fi
+	# create a (i386|sparc)*linux*-{gcc,g++} that can handle -m32 and -m64 (biarch)
+	case ${CTARGET} in
+	i?86*linux*| \
+	sparc*linux*)
+		is_multilib && [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && confgcc="${confgcc} --enable-targets=all"
+	esac
 
 	tc_version_is_at_least 4.3 && set -- "$@" \
 		--with-bugurl=http://bugs.gentoo.org/ \
@@ -2497,13 +2496,7 @@ fix_libtool_libdir_paths() {
 
 is_multilib() {
 	[[ ${GCCMAJOR} < 3 ]] && return 1
-	case ${CTARGET} in
-		mips64*|powerpc64*|s390x*|sparc*|x86_64*)
-			has_multilib_profile || use multilib ;;
-		*-*-solaris*) use multilib ;;
-		*-apple-darwin*) use multilib ;;
-		*)	false ;;
-	esac
+	has_multilib_profile || use multilib
 }
 
 is_cxx() {