From: Christian Bruel <christian.bruel@st.com>
Date: Wed, 27 Jan 2010 13:24:40 +0000 (+0100)
Subject: temporarily revert fix for PR target/42841
X-Git-Tag: releases/gcc-4.5.0~1030
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f6fee0ff25a3667f8ec307ae0150cf38224266c;p=thirdparty%2Fgcc.git

temporarily revert fix for PR target/42841

From-SVN: r156282
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75c6cbffa8ae..af9ad0d56465 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 283bb0ad98a4..cec17b8fc903 100644
--- a/gcc/config/sh/sh.c
+++ b/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;