[ARM] Error if overriding --with-tune by --with-cpu

gcc/

	* config.gcc (supported_defaults): Error when passing either
	--with-tune or --with-arch in conjunction with --with-cpu for ARM.

From-SVN: r212014

gcc/ChangeLog

+2014-06-26  James Greenhalgh  <james.greenhalgh@arm.com>
+
+	* config.gcc (supported_defaults): Error when passing either
+	--with-tune or --with-arch in conjunction with --with-cpu for ARM.
+
 2014-06-26  Richard Biener  <rguenther@suse.de>
 
 	* tree-ssa-dom.c (cprop_operand): Remove restriction on

gcc/config.gcc

@@ -3560,7 +3560,13 @@ case "${target}" in
 		esac
 
 		if test "x$with_arch" != x && test "x$with_cpu" != x; then
-			echo "Warning: --with-arch overrides --with-cpu=$with_cpu" 1>&2
+			echo "Switch \"--with-arch\" may not be used with switch \"--with-cpu\""  1>&2
+			exit 1
+		fi
+
+		if test "x$with_cpu" != x && test "x$with_tune" != x; then
+			echo "Switch \"--with-tune\" may not be used with switch \"--with-cpu\""  1>&2
+			exit 1
 		fi
 
 		# Add extra multilibs