diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9fa33cdec1e..31b5b87ac42 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2003-05-04  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* varasm.c (assemble_variable): Don't use error_with_file_and_line.
+
 2003-05-04  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* builtins.c (expand_builtin_constant_p, expand_builtin_strlen,
diff --git a/gcc/varasm.c b/gcc/varasm.c
index c204c698285..a813546666c 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -1432,10 +1432,9 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
 
   if (!dont_output_data && DECL_SIZE (decl) == 0)
     {
-      error_with_file_and_line (DECL_SOURCE_FILE (decl),
-				DECL_SOURCE_LINE (decl),
-				"storage size of `%s' isn't known",
-				IDENTIFIER_POINTER (DECL_NAME (decl)));
+      error ("%Hstorage size of `%s' isn't known",
+             &DECL_SOURCE_LOCATION (decl),
+             IDENTIFIER_POINTER (DECL_NAME (decl)));
       TREE_ASM_WRITTEN (decl) = 1;
       return;
     }