(finish_decl): Redo last change.

From-SVN: r7156

gcc/c-decl.c

@@ -3412,13 +3412,9 @@ finish_decl (decl, init, asmspec_tree)
   int temporary = allocation_temporary_p ();
   char *asmspec = 0;
 
-  /* If a name was specified, get the string.  Then reset DECL_RTL
-     so that we will remake it with the new name.  */
+  /* If a name was specified, get the string.   */
   if (asmspec_tree)
-    {
-      asmspec = TREE_STRING_POINTER (asmspec_tree);
-      DECL_RTL (decl) = 0;
-    }
+    asmspec = TREE_STRING_POINTER (asmspec_tree);
 
   /* If `start_decl' didn't like having an initialization, ignore it now.  */
 
@@ -3539,9 +3535,13 @@ finish_decl (decl, init, asmspec_tree)
     }
 
   /* If this is a function and an assembler name is specified, it isn't
-     builtin any more.  */
+     builtin any more.  Also reset DECL_RTL so we can give it its new
+     name.  */
   if (TREE_CODE (decl) == FUNCTION_DECL && asmspec)
-    DECL_BUILT_IN (decl) = 0;
+      {
+	DECL_BUILT_IN (decl) = 0;
+	DECL_RTL (decl) = 0;
+      }
 
   /* Output the assembler code and/or RTL code for variables and functions,
      unless the type is an undefined structure or union.