final.c (shorten_branches): Remove conditionalizing on SHORTEN_WITH_ADJUST_INSN_LENGTH

	* final.c (shorten_branches): Remove conditionalizing on
	SHORTEN_WITH_ADJUST_INSN_LENGTH
	* sh.h, pa.h (SHORTEN_WITH_ADJUST_INSN_LENGTH): Remove.

From-SVN: r18470

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17a7a67e0b40a93d0686e067b5b3ae6a3b37c473..fc7ae4113a6721377642ea2ccb155fd54d91e530 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 11 15:07:18 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
+
+       * final.c (shorten_branches): Remove conditionalizing on
+       SHORTEN_WITH_ADJUST_INSN_LENGTH
+       * sh.h, pa.h (SHORTEN_WITH_ADJUST_INSN_LENGTH): Remove.
+
 Wed Mar 11 02:37:41 1998  Jeffrey A Law  (law@cygnus.com)
 
        * flow.c (find_basic_blocks_1): Keep the cfg accurate when removing

diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index 4a0b43cb333efa90cf7f9bd7e5b0409ea4ad1195..3f3c2d0f1bb9322ed04c1b6fb92f04bc74a72b00 100644 (file)
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -1926,9 +1926,6 @@ while (0)
 #define ADJUST_INSN_LENGTH(INSN, LENGTH)       \
   LENGTH += pa_adjust_insn_length (INSN, LENGTH);
 
-/* Enable a bug fix.  (This is for extra caution.)  */
-#define SHORTEN_WITH_ADJUST_INSN_LENGTH
-
 /* Millicode insns are actually function calls with some special
    constraints on arguments and register usage.
 

diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index fad76c91ac4456b5adb4acff4accf678e8258ae9..9e590162ed8c4d39ddd3a6c96a9394fc5357ccf5 100644 (file)
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -1788,9 +1788,6 @@ sh_valid_machine_decl_attribute (DECL, ATTRIBUTES, IDENTIFIER, ARGS)
       && GET_CODE (PATTERN (NEXT_INSN (PREV_INSN (X)))) != SEQUENCE \
       && get_attr_needs_delay_slot (X) == NEEDS_DELAY_SLOT_YES)        \
     (LENGTH) += 2;
-
-/* Enable a bug fix for the shorten_branches pass.  */
-#define SHORTEN_WITH_ADJUST_INSN_LENGTH
 \f
 /* Define the codes that are matched by predicates in sh.c.  */
 #define PREDICATE_CODES \

diff --git a/gcc/final.c b/gcc/final.c
index 89054a892ee34bfed4bcaead95ba8b75e96998ed..b1a870708b72b7e1ae02435708718fa2fe456361 100644 (file)
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1266,10 +1266,8 @@ shorten_branches (first)
           insn = NEXT_INSN (insn))
        {
          int new_length;
-#ifdef SHORTEN_WITH_ADJUST_INSN_LENGTH
 #ifdef ADJUST_INSN_LENGTH
          int tmp_length;
-#endif
 #endif
          int length_align;
 
@@ -1444,13 +1442,11 @@ shorten_branches (first)
              insn_current_address += new_length;
            }
 
-#ifdef SHORTEN_WITH_ADJUST_INSN_LENGTH
 #ifdef ADJUST_INSN_LENGTH
          /* If needed, do any adjustment.  */
          tmp_length = new_length;
          ADJUST_INSN_LENGTH (insn, new_length);
          insn_current_address += (new_length - tmp_length);
-#endif
 #endif
 
          if (new_length != insn_lengths[uid])

diff --git a/gcc/md.texi b/gcc/md.texi
index e3e4ce5f35b9d48d24e6416c6ca2d7bc965a28c2..b7c9a5f3722df85b6cb493210f645cf6e83d92fa 100644 (file)
--- a/gcc/md.texi
+++ b/gcc/md.texi
@@ -3900,8 +3900,7 @@ not specified, 0 is used.
 If defined, modifies the length assigned to instruction @var{insn} as a
 function of the context in which it is used.  @var{length} is an lvalue
 that contains the initially computed length of the insn and should be
-updated with the correct length of the insn.  If updating is required,
-@var{insn} must not be a varying-length insn.
+updated with the correct length of the insn.
 
 This macro will normally not be required.  A case in which it is
 required is the ROMP.  On this machine, the size of an @code{addr_vec}