* config.gcc: Only process --with-cpu logic in the third pass.

From-SVN: r67456

gcc/ChangeLog

 2003-06-04  Daniel Jacobowitz  <drow@mvista.com>
 
+	* config.gcc: Only process --with-cpu logic in the third pass.
+
+2003-06-04  Daniel Jacobowitz  <drow@mvista.com>
+
 	* config.gcc: Reorganize --with-cpu section.  Remove an
 	obsolete comment about the default CPU for x86-64.  Fix
 	a typo for the ep9312.  Update the list of supported PowerPC

gcc/config.gcc

@@ -2130,19 +2130,22 @@ case $machine in
 esac
 
 # Support for --with-cpu and related options (and a few unrelated options,
-# too).
+# too).  Only do this if $machine is the target, or we'll try to validate
+# the CPU argument against the wrong machine type.
 
-case "x$with_cpu" in
-xyes | xno)
+if test "x$pass2done" = xyes
+then
+	case "x$with_cpu" in
+	xyes | xno)
 		echo "--with-cpu must be passed a value" 1>&2
 		exit 1
 		;;
-esac
+	esac
 
-# If there is no $with_cpu option, try to infer one from ${machine}.
-# This block sets nothing except for with_cpu.
-if test x$with_cpu = x
-then
+	# If there is no $with_cpu option, try to infer one from ${machine}.
+	# This block sets nothing except for with_cpu.
+	if test x$with_cpu = x
+	then
 		case $machine in
 		ep9312-*-*)
 			# A Cirrus ARM variant.
@@ -2221,22 +2224,22 @@ then
 			with_cpu="`echo $machine | sed 's/-.*$//'`"
 			;;
 		esac
-fi
+	fi
 
-# Similarly for --with-schedule.
-if test x$with_schedule = x; then
+	# Similarly for --with-schedule.
+	if test x$with_schedule = x; then
 		case $machine in
 		hppa1* | parisc1*)
 			# Override default PA8000 scheduling model.
 			with_schedule=7100LC
 			;;
 		esac
-fi
+	fi
 
-# Optionally, validate the argument to --with-cpu.
-# This block sets nothing.
-case $machine in
-alpha*-*-*)
+	# Optionally, validate the argument to --with-cpu.
+	# This block sets nothing.
+	case $machine in
+	alpha*-*-*)
 		case "x$with_cpu" in
 		x \
 		| xev5 | xev56 | xpca56 | xev6 | xev67)
@@ -2249,7 +2252,7 @@ alpha*-*-*)
 		esac
 		;;
 
-arm*-*-*)
+	arm*-*-*)
 		case "x$with_cpu" in
 		x \
 		| xarm[236789] | xarm250 | xarm[67][01]0 \
@@ -2267,7 +2270,7 @@ arm*-*-*)
 		esac
 		;;
 
-hppa*-*-* | parisc*-*-*)
+	hppa*-*-* | parisc*-*-*)
 		case "x$with_schedule" in
 		x | x700 | x7100 | x7100LC | x7200 | x7300 | x8000)
 			# OK
@@ -2279,7 +2282,7 @@ hppa*-*-* | parisc*-*-*)
 		esac
 		;;
 
-i[34567]86-*-* | x86_64-*-*)
+	i[34567]86-*-* | x86_64-*-*)
 		case x$with_cpu in
 		x \
 		| xi486 \
@@ -2295,7 +2298,7 @@ i[34567]86-*-* | x86_64-*-*)
 		esac
 		;;
 
-powerpc*-*-* | rs6000-*-*)
+	powerpc*-*-* | rs6000-*-*)
 		case "x$with_cpu" in
 		x \
 		| xdefault32 | xdefault64 \
@@ -2316,7 +2319,7 @@ powerpc*-*-* | rs6000-*-*)
 		esac
 		;;
 
-sparc*-*-*)
+	sparc*-*-*)
 		case x$with_cpu in
 		x)
 			echo "Should never happen - no default CPU for sparc target."
@@ -2334,7 +2337,7 @@ sparc*-*-*)
 		esac
 		;;
 
-v850*-*-*)
+	v850*-*-*)
 		case "x$with_cpu" in
 		x | xv850e)
 			# OK
@@ -2345,15 +2348,14 @@ v850*-*-*)
 			;;
 		esac
 		;;
-esac
-
-# Now, for targets which support this, convert --with-cpu to
-# a setting of target_cpu_default2.  This block also sets assorted
-# other configuration variables.
+	esac
 
-target_cpu_default2=
-case $machine in
-alpha*-*-*)
+	# Now, for targets which support this, convert --with-cpu to
+	# a setting of target_cpu_default2.  This block also sets assorted
+	# other configuration variables.
+	target_cpu_default2=
+	case $machine in
+	alpha*-*-*)
 		case $with_cpu in
 			ev67)
 				target_cpu_default2="MASK_CPU_EV6|MASK_BWX|MASK_MAX|MASK_FIX|MASK_CIX"
@@ -2383,7 +2385,7 @@ alpha*-*-*)
 		fi
 		;;
 
-arm*-*-*)
+	arm*-*-*)
 		case "x$with_cpu" in
 		x)
 			# The most generic
@@ -2396,7 +2398,7 @@ arm*-*-*)
 		esac
 		;;
 
-hppa*-*-* | parisc*-*-*)
+	hppa*-*-* | parisc*-*-*)
 		if test x$gas = xyes
 		then
 			target_cpu_default2="MASK_GAS|MASK_JUMP_IN_DELAY"
@@ -2408,7 +2410,7 @@ hppa*-*-* | parisc*-*-*)
 		fi
 		;;
 
-i[34567]86-*-* | x86_64-*-*)
+	i[34567]86-*-* | x86_64-*-*)
 		case x$with_cpu in
 		xathlon-4)
 			target_cpu_default2=TARGET_CPU_DEFAULT_athlon_sse
@@ -2419,7 +2421,7 @@ i[34567]86-*-* | x86_64-*-*)
 		esac
 		;;
 
-mips*-*-*)
+	mips*-*-*)
 		case $machine in
 		mips*-*-ecoff* | mips*-*-elf*)
 			if test x$gas = xyes
@@ -2459,7 +2461,7 @@ mips*-*-*)
 		fi
 		;;
 
-powerpc*-*-* | rs6000-*-*)
+	powerpc*-*-* | rs6000-*-*)
 	        if test x$enable_altivec = xyes
 	        then
 	                tm_file="$tm_file rs6000/altivec-defs.h"
@@ -2474,11 +2476,11 @@ powerpc*-*-* | rs6000-*-*)
 		tmake_file="rs6000/t-rs6000 ${tmake_file}"
 		;;
 
-sparc*-*-*)
+	sparc*-*-*)
 		target_cpu_default2="TARGET_CPU_$with_cpu"
 		;;
 
-v850*-*-*)
+	v850*-*-*)
 		case "x$with_cpu" in
 		x)
 			;;
@@ -2487,16 +2489,17 @@ v850*-*-*)
 			;;
 		esac
 		;;
-esac
+	esac
 
-if test "$target_cpu_default2" != ""
-then
+	if test "$target_cpu_default2" != ""
+	then
 		if test "$target_cpu_default" != ""
 		then
 			target_cpu_default="(${target_cpu_default}|${target_cpu_default2})"
 		else
 			target_cpu_default=$target_cpu_default2
 		fi
+	fi
 fi
 
 # Save data on machine being used to compile GCC in build_xm_file.