varasm.c (output_constant_pool): Restore fnname and fndecl arguments.

	* varasm.c (output_constant_pool): Restore fnname and fndecl
	arguments.
	(assemble_start_function): Adjust call accordingly.
	(assemble_end_function): Likewise.

From-SVN: r112315

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 920ab12404be905a3e3733ad0fff107a105cd0fc..2f1f54872ae2818de09b6f6f9a765148595a8d41 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-03-23  Richard Sandiford  <richard@codesourcery.com>
+
+       * varasm.c (output_constant_pool): Restore fnname and fndecl
+       arguments.
+       (assemble_start_function): Adjust call accordingly.
+       (assemble_end_function): Likewise.
+
 2006-03-22  Volker Reichelt  <reichelt@igpm.rwth-aachen.de>
 
        PR mudflap/26790

diff --git a/gcc/varasm.c b/gcc/varasm.c
index e6249a53917a9855ed38c843d9c8ad82a28f9921..04fb52cebd39902ac4a8ebd4b5f40509c23b389b 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -139,7 +139,7 @@ static void asm_output_aligned_bss (FILE *, tree, const char *,
 #endif
 #endif /* BSS_SECTION_ASM_OP */
 static void mark_weak (tree);
-static void output_constant_pool (void);
+static void output_constant_pool (const char *, tree);
 \f
 /* Well-known sections, each one associated with some sort of *_ASM_OP.  */
 section *text_section;
@@ -1332,7 +1332,7 @@ assemble_start_function (tree decl, const char *fnname)
   app_disable ();
 
   if (CONSTANT_POOL_BEFORE_FUNCTION)
-    output_constant_pool ();
+    output_constant_pool (fnname, decl);
 
   resolve_unique_section (decl, 0, flag_function_sections);
 
@@ -1450,7 +1450,7 @@ assemble_end_function (tree decl, const char *fnname ATTRIBUTE_UNUSED)
 #endif
   if (! CONSTANT_POOL_BEFORE_FUNCTION)
     {
-      output_constant_pool ();
+      output_constant_pool (fnname, decl);
       switch_to_section (function_section (decl)); /* need to switch back */
     }
   /* Output labels for end of hot/cold text sections (to be used by
@@ -3533,7 +3533,8 @@ output_constant_pool_contents (struct rtx_constant_pool *pool)
    out the function's private constant pool.  */
 
 static void
-output_constant_pool (void)
+output_constant_pool (const char *fnname ATTRIBUTE_UNUSED,
+                     tree fndecl ATTRIBUTE_UNUSED)
 {
   struct rtx_constant_pool *pool = cfun->varasm->pool;