From 0cdb761c8c76f38fc26e9da834d60900f37185a5 Mon Sep 17 00:00:00 2001 From: James Greenhalgh Date: Thu, 26 Jun 2014 08:27:05 +0000 Subject: [PATCH] [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 | 5 +++++ gcc/config.gcc | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6a7516c55315..3b1e7b217991 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2014-06-26 James Greenhalgh + + * 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 * tree-ssa-dom.c (cprop_operand): Remove restriction on diff --git a/gcc/config.gcc b/gcc/config.gcc index 93961be7d7a0..dc5cdca843aa 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 -- 2.47.2