Index: gcc/ChangeLog
from  Alexandre Oliva  <aoliva@redhat.com>
	* builtins.c (expand_builtin_stpcpy): Un-simplify decay of stpcpy
	to strcpy.

Index: gcc/builtins.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/builtins.c,v
retrieving revision 1.348
diff -u -p -r1.348 builtins.c
--- gcc/builtins.c 8 Jul 2004 03:40:29 -0000 1.348
+++ gcc/builtins.c 8 Jul 2004 17:06:04 -0000
@@ -3090,7 +3090,14 @@ expand_builtin_stpcpy (tree arglist, rtx
 {
   /* If return value is ignored, transform stpcpy into strcpy.  */
   if (target == const0_rtx)
-    return expand_builtin_strcpy (arglist, target, mode);
+    {
+      tree fn = implicit_built_in_decls[BUILT_IN_STRCPY];
+      if (!fn)
+	return 0;
+
+      return expand_expr (build_function_call_expr (fn, arglist),
+			  target, mode, EXPAND_NORMAL);
+    }
 
   if (!validate_arglist (arglist, POINTER_TYPE, POINTER_TYPE, VOID_TYPE))
     return 0;