diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 606a2147548..12183328e21 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-01  Richard Earnshaw  <rearnsha@arm.com>
+
+	* config.gcc (--with-cpu on ARM): Preserve the canonical cpu name
+	for use in configargs.h.  Put the cname in a separate variable.  Use
+	that to set target_cpu_default2.
+
 2004-09-01  J"orn Rennecke <joern.rennecke@superh.com>
 	    Nick Clifton  <nickc@redhat.com>
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index aee83254a59..dd07eea8d0b 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -2274,7 +2274,7 @@ fi
 				${srcdir}/config/arm/arm-cores.def | \
 				sed -e 's/^[^,]*,[ 	]*//' | \
 				sed -e 's/,.*$//'`
-			  eval "with_$which=$new_val"
+			  eval "target_${which}_cname=$new_val"
 			echo "For $val real value is $new_val"
 			  true
 			else
@@ -2557,16 +2557,12 @@ fi
 		;;
 
 	arm*-*-*)
-		case "x$with_cpu" in
-		x)
-			# The most generic
-			target_cpu_default2="TARGET_CPU_generic"
-			;;
-
-		*)
-			target_cpu_default2="TARGET_CPU_$with_cpu"
-			;;
-		esac
+		if test x$target_cpu_cname = x
+		then
+			target_cpu_default2=TARGET_CPU_generic
+		else
+			target_cpu_default2=TARGET_CPU_$target_cpu_cname
+		fi
 		;;
 
 	m68k*-linux*)