diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6affd168e7c..8e1959ad81d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2012-01-09  Tom de Vries  <tom@codesourcery.com>
+	    Andrew Pinski  <apinski@cavium.com>
+
+	* reorg.c (fill_slots_from_thread): Don't speculate frame-related insns.
+
 2012-01-09  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* sched-int.h (bb_note): Move to...
diff --git a/gcc/reorg.c b/gcc/reorg.c
index 0b90550add5..3fa53939d5e 100644
--- a/gcc/reorg.c
+++ b/gcc/reorg.c
@@ -2716,7 +2716,8 @@ fill_slots_from_thread (rtx insn, rtx condition, rtx thread,
 	  if (!must_annul
 	      && (condition == const_true_rtx
 	          || (! insn_sets_resource_p (trial, &opposite_needed, true)
-		      && ! may_trap_or_fault_p (pat))))
+		      && ! may_trap_or_fault_p (pat)
+		      && ! RTX_FRAME_RELATED_P (trial))))
 	    {
 	      old_trial = trial;
 	      trial = try_split (pat, trial, 0);