aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Blundell <pb@nexus.co.uk>1999-05-22 09:11:10 +0000
committerNick Clifton <nickc@gcc.gnu.org>1999-05-22 09:11:10 +0000
commited4e4c744119bc235110c121e12d79494404a8c6 (patch)
tree567499f853356e172f9d4084c9d5f79f99a5bff8
parentd1fbba38878411c4b77db638fdd4338a5b888a2b (diff)
downloadgcc-ed4e4c744119bc235110c121e12d79494404a8c6.zip
gcc-ed4e4c744119bc235110c121e12d79494404a8c6.tar.gz
gcc-ed4e4c744119bc235110c121e12d79494404a8c6.tar.bz2
Fix erroneous warning message
From-SVN: r27099
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/config/arm/arm.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1744524..9e3bfd3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 18 17:44:22 1999 Philip Blundell <pb@nexus.co.uk>
+
+ * config/arm/arm.c (arm_override_options): Fix erroneous warning
+ message.
+
Sat May 22 09:06:33 1999 Nick Clifton <nickc@cygnus.com>
* config/arm/arm.h (NEED_PLT_GOT): Only define if not already
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index e2fe037..5034343 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -291,7 +291,7 @@ arm_override_options ()
a warning though, and we prefer the CPU over the
architecture. */
if (insn_flags != 0 && (insn_flags ^ sel->flags))
- warning ("switch -mcpu=%s conflicts with -mtune= switch",
+ warning ("switch -mcpu=%s conflicts with -march= switch",
ptr->string);
insn_flags = sel->flags;