sh.c (barrier_align): Recognize branch around far branch and redundant insn.

* config/sh/sh.c (barrier_align): Recognize branch around far
branch and redundant insn.

From-SVN: r38923

gcc/ChangeLog

+2001-01-11  Alexandre Oliva  <aoliva@redhat.com>
+
+	* config/sh/sh.c (barrier_align): Recognize branch around far
+	branch and redundant insn.
+
 2001-01-11  Neil Booth  <neil@daikokuya.demon.co.uk>
 
         * invoke.texi: Restore documentation of the drivers' switches -MD

gcc/config/sh/sh.c

@@ -2862,7 +2862,11 @@ barrier_align (barrier_or_label)
       if (prev
 	  && GET_CODE (prev) == JUMP_INSN
 	  && JUMP_LABEL (prev)
-	  && (jump_to_next || next_real_insn (JUMP_LABEL (prev)) == next))
+	  && (jump_to_next || next_real_insn (JUMP_LABEL (prev)) == next
+	      /* If relax_delay_slots() decides NEXT was redundant
+		 with some previous instruction, it will have
+		 redirected PREV's jump to the following insn.  */
+	      || JUMP_LABEL (prev) == next_nonnote_insn (next)))
 	{
 	  rtx pat = PATTERN (prev);
 	  if (GET_CODE (pat) == PARALLEL)