diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c28396662a6..ce0991ca769 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-21  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR rtl-optimization/24460
+	* bb-reorder.c (fix_crossing_unconditional_branches): Do not
+	set the basic block for barriers.
+
 2005-10-21  Janis Johnson  <janis187@us.ibm.com>
 
 	* var-tracking.c (vt_initialize): Initialize post.
diff --git a/gcc/bb-reorder.c b/gcc/bb-reorder.c
index 8bf37afe189..a142fe204e0 100644
--- a/gcc/bb-reorder.c
+++ b/gcc/bb-reorder.c
@@ -1739,7 +1739,8 @@ fix_crossing_unconditional_branches (void)
 	      for (cur_insn = indirect_jump_sequence; cur_insn;
 		   cur_insn = NEXT_INSN (cur_insn))
 		{
-		  BLOCK_FOR_INSN (cur_insn) = cur_bb;
+		  if (!BARRIER_P (cur_insn))
+		    BLOCK_FOR_INSN (cur_insn) = cur_bb;
 		  if (JUMP_P (cur_insn))
 		    jump_insn = cur_insn;
 		}