diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 126e635dc72..7ad6dfd35e6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 23 15:01:13 1998  Nick Clifton  <nickc@cygnus.com>
+
+	* config/arm/arm.c (find_barrier): Return as soon as a barrier is
+	found, rather than at end of the loop, after the insn has been
+	changed. 
+
 Thu Apr 23 20:21:06 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* sh.c (gen_ashift_hi): Implement right shifts via gen_ashift.
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index e8d5f8453f4..28614a2d2e9 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3539,7 +3539,7 @@ find_barrier (from, max_count)
   while (from && count < max_count)
     {
       if (GET_CODE (from) == BARRIER)
-	found_barrier = from;
+	return from;
 
       /* Count the length of this insn */
       if (GET_CODE (from) == INSN