diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 54297f26f68..db7f740c0de 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+	* except.c (make_reg_eh_region_note): Change argument to
+	rtx_insn *.
+	(make_reg_eh_region_note_nothrow_nononlocal): Likewise.
+	* except.h: Adjust.
+
 2015-05-08  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
 	* mode-switching.c (commit_mode_sets): Change type of local
diff --git a/gcc/except.c b/gcc/except.c
index d6095926a99..e4264bf5fc8 100644
--- a/gcc/except.c
+++ b/gcc/except.c
@@ -1694,7 +1694,7 @@ for_each_eh_label (void (*callback) (rtx))
   direct call cases) and just pull the data out of the trees.  */
 
 void
-make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr)
+make_reg_eh_region_note (rtx_insn *insn, int ecf_flags, int lp_nr)
 {
   rtx value;
   if (ecf_flags & ECF_NOTHROW)
@@ -1711,7 +1711,7 @@ make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr)
    already exists.  */
 
 void
-make_reg_eh_region_note_nothrow_nononlocal (rtx insn)
+make_reg_eh_region_note_nothrow_nononlocal (rtx_insn *insn)
 {
   rtx note = find_reg_note (insn, REG_EH_REGION, NULL_RTX);
   rtx intmin = GEN_INT (INT_MIN);
diff --git a/gcc/except.h b/gcc/except.h
index eb812033dc8..504b4bde135 100644
--- a/gcc/except.h
+++ b/gcc/except.h
@@ -270,8 +270,8 @@ extern eh_region get_eh_region_from_lp_number (int);
 
 extern eh_region eh_region_outermost (struct function *, eh_region, eh_region);
 
-extern void make_reg_eh_region_note (rtx insn, int ecf_flags, int lp_nr);
-extern void make_reg_eh_region_note_nothrow_nononlocal (rtx);
+extern void make_reg_eh_region_note (rtx_insn *insn, int ecf_flags, int lp_nr);
+extern void make_reg_eh_region_note_nothrow_nononlocal (rtx_insn *);
 
 extern void verify_eh_tree (struct function *);
 extern void dump_eh_tree (FILE *, struct function *);