[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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a7516c55315deca6d1639b30c96763e26f842e5..3b1e7b217991862c5128c3a59111a7fd3e88ee72 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 93961be7d7a0fd478c503a1f43e36868d9d7f51d..dc5cdca843aa58f1c1e1f0cbda07fb7af6d8d04c 100644 (file)
--- a/gcc/config.gcc
+++ b/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