temporarily revert fix for PR target/42841

From-SVN: r156282

gcc/ChangeLog

+2010-01-27  Christian Bruel  <christian.bruel@st.com>
+
+	Revert:
+	PR target/42841
+	* config/sh/sh.c (find_barrier): Increase length for non delayed
+	conditional branches.
+	
 2010-01-27  Matthias Klose  <doko@ubuntu.com>
 
 	* configure.ac (gnu-unique-object): Fix ldd version check.

gcc/config/sh/sh.c

@@ -4567,13 +4567,6 @@ find_barrier (int num_mova, rtx mova, rtx from)
 	       && ! TARGET_SMALLCODE)
 	new_align = 4;
 
-      /* There is a possibility that a bf is transformed into a bf/s by the
-	 delay slot scheduler.  */
-      if (JUMP_P (from) && !JUMP_TABLE_DATA_P (from) 
-	  && get_attr_type (from) == TYPE_CBRANCH
-	  && GET_CODE (PATTERN (NEXT_INSN (PREV_INSN (from)))) != SEQUENCE)
-	inc += 2;
-
       if (found_si)
 	{
 	  count_si += inc;