diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1cac5d27fb5..06f6bb2570a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-19  Richard Earnshaw  <rearnsha@arm.com>
+
+	* arm.c (thumb1_reorg): When scanning backwards skip anything
+	that's not a proper insn.
+
 2014-05-19  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/61221
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index bd86a58f2ee..43a8c4195b4 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -16935,7 +16935,7 @@ thumb1_reorg (void)
       rtx prev, insn = BB_END (bb);
       bool insn_clobbered = false;
 
-      while (insn != BB_HEAD (bb) && DEBUG_INSN_P (insn))
+      while (insn != BB_HEAD (bb) && !NONDEBUG_INSN_P (insn))
 	insn = PREV_INSN (insn);
 
       /* Find the last cbranchsi4_insn in basic block BB.  */