aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Greenhalgh <james.greenhalgh@arm.com>2014-06-26 08:27:05 +0000
committerJames Greenhalgh <jgreenhalgh@gcc.gnu.org>2014-06-26 08:27:05 +0000
commit0cdb761c8c76f38fc26e9da834d60900f37185a5 (patch)
treeed0cade630b2c1ca721cba89606a0f38c5a39772
parentcbe26b97ab0653b334285ee6af45781c49490db2 (diff)
downloadgcc-0cdb761c8c76f38fc26e9da834d60900f37185a5.zip
gcc-0cdb761c8c76f38fc26e9da834d60900f37185a5.tar.gz
gcc-0cdb761c8c76f38fc26e9da834d60900f37185a5.tar.bz2
[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
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config.gcc8
2 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6a7516c..3b1e7b2 100644
--- 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 93961be..dc5cdca 100644
--- 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