pa.c (output_function_prologue): Reverse last change.

        * pa.c (output_function_prologue): Reverse last change.  Output
        both the function label and the .PROC here.
        * pa.h (ASM_DECLARE_FUNCTION_NAME): Do not output the function
        label or the .PROC here.

From-SVN: r6246

gcc/config/pa/pa.c

@@ -1988,6 +1988,12 @@ output_function_prologue (file, size)
      FILE *file;
      int size;
 {
+  /* The function's label and associated .PROC must never be
+     separated and must be output *after* any profiling declarations
+     to avoid changing spaces/subspaces within a procedure.  */
+  ASM_OUTPUT_LABEL (file, XSTR (XEXP (DECL_RTL (current_function_decl), 0), 0));
+  fputs ("\t.PROC\n", file);
+
   /* hppa_expand_prologue does the dirty work now.  We just need
      to output the assembler directives which denote the start
      of a function.  */

gcc/config/pa/pa.h

@@ -931,9 +931,7 @@ extern enum cmp_type hppa_branch_type;
 	     else if (fntype != void_type_node)				\
 	       fprintf (FILE, ",RTNVAL=GR");				\
 	     fputs ("\n", FILE);					\
-	   }								\
-	 ASM_OUTPUT_LABEL (FILE, NAME);					\
-	 fputs ("\t.PROC\n", FILE);} while (0)
+	   }} while (0)
 
 /* This macro generates the assembly code for function entry.
    FILE is a stdio stream to output the code to.