diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 174452417bea0c327a4e04136584c02ecaa5ed52..9e3bfd3207360067ef37be6baafb7b383793aa57 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 e2fe037ad56fbde78913b43dbfbfa72f0898e65a..50343430c9b7f5baca7babd629468dfd60c47b48 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;