Revert REG_CFA_TEMPORARY changes, bring in 32-bit fixes.split

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

1 files changed, 1 insertions, 21 deletions

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 84997a28865..5ee14ee6bcf 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -473,7 +473,6 @@ static void output_call_frame_info (int);
 static void dwarf2out_note_section_used (void);
 static bool clobbers_queued_reg_save (const_rtx);
 static void dwarf2out_frame_debug_expr (rtx, const char *);
-static void dwarf2out_frame_debug_remember_state (void);
 
 /* Support for complex CFA locations.  */
 static void output_cfa_loc (dw_cfi_ref);
@@ -2827,17 +2826,6 @@ dwarf2out_frame_debug (rtx insn, bool after_p)
 	handled_one = true;
 	break;
 
-      case REG_CFA_TEMPORARY:
-	if (!after_p)
-	  {
-	    dwarf2out_frame_debug_remember_state ();
-	    dwarf2out_frame_debug_def_cfa (XEXP (note, 0), label);
-	  }
-	else
-	  dwarf2out_frame_debug_restore_state ();
-	handled_one = true;
-	break;
-
       default:
 	break;
       }
@@ -2926,17 +2914,9 @@ dwarf2out_cfi_begin_epilogue (rtx insn)
     }
   emit_note_before (NOTE_INSN_CFA_RESTORE_STATE, i);
 
-  dwarf2out_frame_debug_remember_state ();
-}
-
-/* Remember the current state.  */
-
-static void
-dwarf2out_frame_debug_remember_state (void)
-{
   emit_cfa_remember = true;
 
-  /* Emulate the state save.  */
+  /* And emulate the state save.  */
   gcc_assert (!cfa_remember.in_use);
   cfa_remember = cfa;
   cfa_remember.in_use = 1;