Fix previous mis-applied patch.

	* config/m68k/m68k.md (m68k_output_function_prologue): Always call
	dwarf2out_def_cfa. Only add space for frame pointer to cfa_offset
	when frame_pointer_needed.

From-SVN: r108801

diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c
index 2ef980fe9cc7658eb187a5736c2c87b102c1d935..09556d0e14d1b879957eb55754c2aa165ccf52f7 100644 (file)
--- a/gcc/config/m68k/m68k.c
+++ b/gcc/config/m68k/m68k.c
@@ -599,18 +599,18 @@ m68k_output_function_prologue (FILE *stream,
     {
       if (frame_pointer_needed)
        {
-        cfa_offset += current_frame.size + 4;
-        char *l;
+         char *l;
          l = (char *) dwarf2out_cfi_label ();
-        cfa_offset += 4;                                                      +         dwarf2out_reg_save (l, FRAME_POINTER_REGNUM, -cfa_offset);
-        dwarf2out_def_cfa (l, FRAME_POINTER_REGNUM, cfa_offset);
-        cfa_offset += current_frame.size;
-       }
+         cfa_offset += 4;
+         dwarf2out_reg_save (l, FRAME_POINTER_REGNUM, -cfa_offset);
+         dwarf2out_def_cfa (l, FRAME_POINTER_REGNUM, cfa_offset);
+         cfa_offset += current_frame.size;
+        }
       else
-       {
-        cfa_offset += current_frame.size;
-        dwarf2out_def_cfa ("", STACK_POINTER_REGNUM, cfa_offset);
-       }
+        {
+         cfa_offset += current_frame.size;
+         dwarf2out_def_cfa ("", STACK_POINTER_REGNUM, cfa_offset);
+        }
     }
 
   if (current_frame.fpu_mask)