sh.c (barrier_align): Also recognize branch-around-a-jump-sequence from…

sh.c (barrier_align): Also recognize branch-around-a-jump-sequence from machine-depedent_reorg for...

	* sh.c (barrier_align): Also recognize branch-around-a-jump-sequence
	from machine-depedent_reorg for purposes of alignment supression
	when no delay slot insn has been added.

From-SVN: r43493

gcc/ChangeLog

+Thu Jun 21 22:15:10 2001  J"orn Rennecke <amylaar@redhat.com>
+
+	* sh.c (barrier_align): Also recognize branch-around-a-jump-sequence
+	from machine-depedent_reorg for purposes of alignment supression
+	when no delay slot insn has been added.
+
 2001-06-21  Neil Booth  <neil@cat.daikokuya.demon.co.uk>
 
 	* cppmacro.c (make_string_token): Null terminate.

gcc/config/sh/sh.c

@@ -2948,11 +2948,10 @@ barrier_align (barrier_or_label)
 	      /* There is no upper bound on redundant instructions that
 		 might have been skipped, but we must not put an alignment
 		 where none had been before.  */
-	      || (NEXT_INSN (PREV_INSN (prev)) != prev
-		  && ((INSN_CODE (NEXT_INSN (NEXT_INSN (prev)))
+	      || (INSN_CODE (NEXT_INSN (NEXT_INSN (PREV_INSN (prev))))
 		  == CODE_FOR_block_branch_redirect)
-		      || (INSN_CODE (NEXT_INSN (NEXT_INSN (prev)))
-			  == CODE_FOR_indirect_jump_scratch)))))
+	      || (INSN_CODE (NEXT_INSN (NEXT_INSN (PREV_INSN (prev))))
+		  == CODE_FOR_indirect_jump_scratch)))
 	{
 	  rtx pat = PATTERN (prev);
 	  if (GET_CODE (pat) == PARALLEL)