summaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorchrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-27 13:24:40 +0000
committerchrbr <chrbr@138bc75d-0d04-0410-961f-82ee72b054a4>2010-01-27 13:24:40 +0000
commit8b8c291df635a4bc027732ccded6c488679eb41a (patch)
tree3b660f542fc4d2a827f7bc1e9cfaf24a87a5c22e /gcc
parent149405350be50c105b4b0e97a57f745006318f76 (diff)
downloadgcc-8b8c291df635a4bc027732ccded6c488679eb41a.tar.gz
temporarily revert fix for PR target/42841
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156282 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/sh/sh.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 75c6cbffa8a..af9ad0d5646 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 283bb0ad98a..cec17b8fc90 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;