* sparc.c (dwarf2out_cfi_label): Add declaration.

	(save_regs, output_function_prologue): Remove cast for it.
	(sparc_flat_{save_restore,output_function_prologue): Likewise.
	({save,restore}_regs): No longer inline.

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

diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 75a9eb5..91d731f 100644 (file)
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -113,6 +113,10 @@ static int frame_base_offset;
 
 static rtx find_addr_reg ();
 static void sparc_init_modes ();
+
+#ifdef DWARF2_DEBUGGING_INFO
+extern char *dwarf2out_cfi_label ();
+#endif
 \f
 /* Option handling.  */
 
@@ -2926,9 +2930,6 @@ sparc_init_modes ()
    N_REGS is the number of 4-byte regs saved thus far.  This applies even to
    v9 int regs as it simplifies the code.  */
 
-#ifdef __GNUC__
-__inline__
-#endif
 static int
 save_regs (file, low, high, base, offset, n_regs, real_offset)
      FILE *file;
@@ -2965,7 +2966,7 @@ save_regs (file, low, high, base, offset, n_regs, real_offset)
                         reg_names[i], base, offset + 4 * n_regs);
                if (dwarf2out_do_frame ())
                  {
-                   char *l = (char *) dwarf2out_cfi_label ();
+                   char *l = dwarf2out_cfi_label ();
                    dwarf2out_reg_save (l, i, real_offset + 4 * n_regs);
                    dwarf2out_reg_save (l, i+1, real_offset + 4 * n_regs + 4);
                  }
@@ -2997,9 +2998,6 @@ save_regs (file, low, high, base, offset, n_regs, real_offset)
    N_REGS is the number of 4-byte regs saved thus far.  This applies even to
    v9 int regs as it simplifies the code.  */
 
-#ifdef __GNUC__
-__inline__
-#endif
 static int
 restore_regs (file, low, high, base, offset, n_regs)
      FILE *file;
@@ -3228,7 +3226,7 @@ output_function_prologue (file, size, leaf_function)
 
   if (dwarf2out_do_frame () && actual_fsize)
     {
-      char *label = (char *) dwarf2out_cfi_label ();
+      char *label = dwarf2out_cfi_label ();
 
       /* The canonical frame address refers to the top of the frame.  */
       dwarf2out_def_cfa (label, (leaf_function ? STACK_POINTER_REGNUM
@@ -4731,7 +4729,8 @@ sparc_flat_compute_frame_size (size)
    DOUBLEWORD_OP is either "std" for save, "ldd" for restore.  */
 
 void
-sparc_flat_save_restore (file, base_reg, offset, gmask, fmask, word_op, doubleword_op, base_offset)
+sparc_flat_save_restore (file, base_reg, offset, gmask, fmask, word_op,
+                        doubleword_op, base_offset)
      FILE *file;
      char *base_reg;
      unsigned int offset;
@@ -4773,7 +4772,7 @@ sparc_flat_save_restore (file, base_reg, offset, gmask, fmask, word_op, doublewo
                               base_reg, offset);
                      if (dwarf2out_do_frame ())
                        {
-                         char *l = (char *) dwarf2out_cfi_label ();
+                         char *l = dwarf2out_cfi_label ();
                          dwarf2out_reg_save (l, regno, offset + base_offset);
                          dwarf2out_reg_save
                            (l, regno+1, offset+base_offset + UNITS_PER_WORD);
@@ -4920,7 +4919,7 @@ sparc_flat_output_function_prologue (file, size)
            }
          if (dwarf2out_do_frame ())
            {
-             char *l = (char *) dwarf2out_cfi_label ();
+             char *l = dwarf2out_cfi_label ();
              if (gmask & FRAME_POINTER_MASK)
                {
                  dwarf2out_reg_save (l, FRAME_POINTER_REGNUM,
@@ -4978,7 +4977,7 @@ sparc_flat_output_function_prologue (file, size)
            }
          if (dwarf2out_do_frame ())
            {
-             char *l = (char *) dwarf2out_cfi_label ();
+             char *l = dwarf2out_cfi_label ();
              if (gmask & FRAME_POINTER_MASK)
                {
                  dwarf2out_reg_save (l, FRAME_POINTER_REGNUM,