(bc_output_ascii): New function.

(assemble_string): Use it.
(assemble_static_space, assemble_variable): Put braces around uses
of BC_OUTPUT_COMMON and BC_OUTPUT_LOCAL.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@5596 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/varasm.c b/gcc/varasm.c
index e39f546..13ae19e 100644 (file)
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -91,6 +91,7 @@ static char *compare_constant_1 ();
 static void record_constant_1 ();
 static void output_constant_def_contents ();
 static int contains_pointers_p ();
+static void bc_output_ascii ();
 
 void output_constant_pool ();
 void assemble_name ();
@@ -810,7 +811,7 @@ assemble_string (p, size)
        thissize = maximum;
 
       if (output_bytecode)
-       BC_OUTPUT_ASCII (asm_out_file, p, thissize);
+       bc_output_ascii (asm_out_file, p, thissize);
       else
        {
          ASM_OUTPUT_ASCII (asm_out_file, p, thissize);
@@ -820,6 +821,15 @@ assemble_string (p, size)
       p += thissize;
     }
 }
+
+static void
+bc_output_ascii (file, p, size)
+     FILE *file;
+     char *p;
+     int size;
+{
+  BC_OUTPUT_ASCII (file, p, size);
+}
 \f
 /* Assemble everything that is needed for a variable or function declaration.
    Not used for automatic variables, and not used for function definitions.
@@ -1005,7 +1015,9 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
          else
 #endif
            if (output_bytecode)
-             BC_OUTPUT_COMMON (asm_out_file, name, size, rounded);
+             {
+               BC_OUTPUT_COMMON (asm_out_file, name, size, rounded);
+             }
            else
              {
 #ifdef ASM_OUTPUT_ALIGNED_COMMON
@@ -1024,7 +1036,9 @@ assemble_variable (decl, top_level, at_end, dont_output_data)
          else
 #endif
            if (output_bytecode)
-             BC_OUTPUT_LOCAL (asm_out_file, name, size, rounded);
+             {
+               BC_OUTPUT_LOCAL (asm_out_file, name, size, rounded);
+             }
            else
              {
 #ifdef ASM_OUTPUT_ALIGNED_LOCAL
@@ -1430,7 +1444,9 @@ assemble_static_space (size)
     x = gen_rtx (SYMBOL_REF, Pmode, namestring);
 
   if (output_bytecode)
-    BC_OUTPUT_LOCAL (asm_out_file, name, size, rounded);
+    {
+      BC_OUTPUT_LOCAL (asm_out_file, name, size, rounded);
+    }
   else
     {
 #ifdef ASM_OUTPUT_ALIGNED_LOCAL