diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d2757133c64..3bc2fde69cf 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-11-10  Jakub Jelinek  <jakub@redhat.com>
+
+	PR other/4372
+	* varasm.c (assemble_alias): Use %q+D in the error
+	message instead of %J and %qD.
+
 2005-11-10  Richard Guenther  <rguenther@suse.de>
 
 	* gcse.c (free_ldst_entry): Only free hashtable if
diff --git a/gcc/varasm.c b/gcc/varasm.c
index f9fa0fdf181..e937e654b4a 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -4855,7 +4855,7 @@ assemble_alias (tree decl, tree target)
       ultimate_transparent_alias_target (&target);
 
       if (alias == target)
-	error ("%Jweakref %qD ultimately targets itself", decl, decl);
+	error ("weakref %q+D ultimately targets itself", decl);
       else
 	{
 #ifndef ASM_OUTPUT_WEAKREF