diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 93de949630c..b91fd74bc45 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/26146
+	* config.gcc: Check with_cpu for i[34567]86--*-solaris2.1[0-9]*.
+
 2006-07-05  Richard Guenther  <rguenther@suse.de>
 
 	PR target/28158
diff --git a/gcc/config.gcc b/gcc/config.gcc
index a4b1fb3460b..6058972602f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1175,6 +1175,20 @@ i[34567]86-*-solaris2*)
 		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
 		tmake_file="$tmake_file i386/t-sol2-10"
 		need_64bit_hwint=yes
+		# FIXME: -m64 for i[34567]86-*-* should be allowed just
+		# like -m32 for x86_64-*-*.
+		case X"${with_cpu}" in
+		Xgeneric|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
+			;;
+		X)
+			with_cpu=generic
+			;;
+		*)
+			echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
+			echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
+			exit 1
+			;;
+		esac
 		# Solaris 2.10 provides crt1.o, crti.o, crtn.o, and gcrt1.o as 
 		# part of the base system.
 		extra_parts="gmon.o crtbegin.o crtend.o"