diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ceae6db832..1be59fdfa01 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-12  Jeff Law  <law@redhat.com>
+
+	* config/h8300/h8300.c (Fpa): Use RTX_FRAME_RELATED_P directly
+	rather than calling F.
+
 2015-01-12  Bernd Edlinger  <bernd.edlinger@hotmail.de>
 
 	* tsan.c (instrument_expr): Use force_gimple_operand.
diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c
index fe85df5ad67..720e0e464ef 100644
--- a/gcc/config/h8300/h8300.c
+++ b/gcc/config/h8300/h8300.c
@@ -527,7 +527,7 @@ Fpa (rtx par)
   int i;
 
   for (i = 0; i < len; i++)
-    F (as_a <rtx_insn *> (XVECEXP (par, 0, i)), true);
+    RTX_FRAME_RELATED_P (XVECEXP (par, 0, i)) = 1;
 
   return par;
 }