diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 468a0b7f7e9a..2f319458731f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* errors.h (warning, error, fatal, internal_error): Add printf
+	attribute.
+	* genmodes.c (make_vector_mode): Fix format arguments.
+
 2005-05-31  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* basic-block.h, bb-reorder.c, c-gimplify.c, config/darwin.c,
diff --git a/gcc/errors.h b/gcc/errors.h
index 9aa87e72852c..cc0c4a07b967 100644
--- a/gcc/errors.h
+++ b/gcc/errors.h
@@ -30,10 +30,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #ifndef GCC_ERRORS_H
 #define GCC_ERRORS_H
 
-extern void warning (int, const char *, ...);
-extern void error (const char *, ...);
-extern void fatal (const char *, ...) ATTRIBUTE_NORETURN;
-extern void internal_error (const char *, ...) ATTRIBUTE_NORETURN;
+extern void warning (int, const char *, ...) ATTRIBUTE_PRINTF_2;
+extern void error (const char *, ...) ATTRIBUTE_PRINTF_1;
+extern void fatal (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_1;
+extern void internal_error (const char *, ...) ATTRIBUTE_NORETURN ATTRIBUTE_PRINTF_1;
 extern const char *trim_filename (const char *);
 
 extern int have_error;
diff --git a/gcc/genmodes.c b/gcc/genmodes.c
index 74c71c946585..42a8d03c83e6 100644
--- a/gcc/genmodes.c
+++ b/gcc/genmodes.c
@@ -620,7 +620,7 @@ make_vector_mode (enum mode_class bclass,
 			ncomponents, base) >= sizeof namebuf)
     {
       error ("%s:%d: mode name \"%s\" is too long",
-	     base, file, line);
+	     file, line, base);
       return;
     }