* jump.c (jump_optimize_1): Revert 05-18 change.

From-SVN: r34307

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 946f3c4045fa4617ef7446aee58eb505dc451d9e..59870df69b1e6d105dc0646d915dfb6a27a7bdff 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2000-05-31  Richard Henderson  <rth@cygnus.com>
+
+       * jump.c (jump_optimize_1): Revert 05-18 change.
+
 2000-05-31  Mark Mitchell  <mark@codesourcery.com>
 
        * invoke.texi: Remove documentation for -fguiding-decls.

diff --git a/gcc/jump.c b/gcc/jump.c
index d8c34832dfc1529fe615590d7623c01399b1d92d..9928b51d013aab55e45e55f603192b0e45355eec 100644 (file)
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -620,8 +620,7 @@ jump_optimize_1 (f, cross_jump, noop_moves, after_regscan,
                  /* TARGET is nonzero if it is ok to cross jump
                     to code before TARGET.  If so, see if matches.  */
                  if (x != 0)
-                   find_cross_jump (insn, x,
-                                    (optimize_size ? 1 : BRANCH_COST) + 1,
+                   find_cross_jump (insn, x, 2,
                                     &newjpos, &newlpos);
 
                  if (newjpos != 0)
@@ -658,8 +657,7 @@ jump_optimize_1 (f, cross_jump, noop_moves, after_regscan,
 
                  /* TARGET is nonzero if it is ok to cross jump
                     to code before TARGET.  If so, see if matches.  */
-                 find_cross_jump (insn, JUMP_LABEL (insn),
-                                  optimize_size ? 1 : BRANCH_COST,
+                 find_cross_jump (insn, JUMP_LABEL (insn), 1,
                                   &newjpos, &newlpos);
 
                  /* If cannot cross jump to code before the label,
@@ -674,8 +672,7 @@ jump_optimize_1 (f, cross_jump, noop_moves, after_regscan,
                          && JUMP_LABEL (target) == JUMP_LABEL (insn)
                          /* Ignore TARGET if it's deleted.  */
                          && ! INSN_DELETED_P (target))
-                       find_cross_jump (insn, target,
-                                        (optimize_size ? 1 : BRANCH_COST) + 1,
+                       find_cross_jump (insn, target, 2,
                                         &newjpos, &newlpos);
 
                  if (newjpos != 0)
@@ -706,8 +703,7 @@ jump_optimize_1 (f, cross_jump, noop_moves, after_regscan,
                    if (target != insn
                        && ! INSN_DELETED_P (target)
                        && GET_CODE (PATTERN (target)) == RETURN)
-                     find_cross_jump (insn, target,
-                                      (optimize_size ? 1 : BRANCH_COST) + 1,
+                     find_cross_jump (insn, target, 2,
                                       &newjpos, &newlpos);
 
                  if (newjpos != 0)