From: Philip Blundell <pb@nexus.co.uk>
Date: Sat, 22 May 1999 09:11:10 +0000 (+0000)
Subject: Fix erroneous warning message
X-Git-Tag: releases/libgcj-2.95.0~409
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed4e4c744119bc235110c121e12d79494404a8c6;p=thirdparty%2Fgcc.git

Fix erroneous warning message

From-SVN: r27099
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 174452417bea..9e3bfd320736 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 e2fe037ad56f..50343430c9b7 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;