summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/final.c6
-rw-r--r--gcc/insn-notes.def4
3 files changed, 7 insertions, 9 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c86e6da4034..b2ed72a61b3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
2011-07-25 Richard Henderson <rth@redhat.com>
+ * insn-notes.def (NOTE_INSN_CFA_RESTORE_STATE): Remove.
+ * final.c (final_scan_insn): Don't test for it.
+ (rest_of_clean_state): Likewise.
+
+2011-07-25 Richard Henderson <rth@redhat.com>
+
PR debug/49841
* config/rs6000/rs6000.c (rs6000_frame_related): Return the insn.
(emit_frame_save): Likewise.
diff --git a/gcc/final.c b/gcc/final.c
index 3416955d7ee..1d80adffc48 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1977,9 +1977,6 @@ final_scan_insn (rtx insn, FILE *file, int optimize_p ATTRIBUTE_UNUSED,
targetm.asm_out.function_begin_epilogue (file);
break;
- case NOTE_INSN_CFA_RESTORE_STATE:
- break;
-
case NOTE_INSN_CFI:
dwarf2out_emit_cfi (NOTE_CFI (insn));
break;
@@ -4373,8 +4370,7 @@ rest_of_clean_state (void)
(NOTE_KIND (insn) != NOTE_INSN_VAR_LOCATION
&& NOTE_KIND (insn) != NOTE_INSN_CALL_ARG_LOCATION
&& NOTE_KIND (insn) != NOTE_INSN_BLOCK_BEG
- && NOTE_KIND (insn) != NOTE_INSN_BLOCK_END
- && NOTE_KIND (insn) != NOTE_INSN_CFA_RESTORE_STATE)))
+ && NOTE_KIND (insn) != NOTE_INSN_BLOCK_END)))
print_rtl_single (final_output, insn);
}
diff --git a/gcc/insn-notes.def b/gcc/insn-notes.def
index 859cdacab59..2ea673f05e6 100644
--- a/gcc/insn-notes.def
+++ b/gcc/insn-notes.def
@@ -73,10 +73,6 @@ INSN_NOTE (BASIC_BLOCK)
between hot and cold text sections. */
INSN_NOTE (SWITCH_TEXT_SECTIONS)
-/* Mark the restore point after an epilogue changed CFI data. Used only
- when an epilogue appears in the middle of a function. */
-INSN_NOTE (CFA_RESTORE_STATE)
-
/* When emitting dwarf2 frame information, contains a directive that
should be emitted. */
INSN_NOTE (CFI)