aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJ"orn Rennecke <amylaar@cygnus.co.uk>1998-03-11 07:12:31 +0000
committerJoern Rennecke <amylaar@gcc.gnu.org>1998-03-11 07:12:31 +0000
commita8aa4e0b90b649cdf52e3ba54671f8a4a48df50a (patch)
treeb75589bcc86f0a7fbf0f1f409b6becd7e63d3054 /gcc
parent6af3488510bf96c43ef3aecb5f93c6ba1ad43387 (diff)
downloadgcc-a8aa4e0b90b649cdf52e3ba54671f8a4a48df50a.zip
gcc-a8aa4e0b90b649cdf52e3ba54671f8a4a48df50a.tar.gz
gcc-a8aa4e0b90b649cdf52e3ba54671f8a4a48df50a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/pa/pa.h3
-rw-r--r--gcc/config/sh/sh.h3
-rw-r--r--gcc/final.c4
-rw-r--r--gcc/md.texi3
5 files changed, 7 insertions, 12 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 17a7a67..fc7ae41 100644
--- 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 4a0b43c..3f3c2d0 100644
--- 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 fad76c9..9e59016 100644
--- 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
/* 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 89054a8..b1a8707 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -1266,11 +1266,9 @@ 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;
uid = INSN_UID (insn);
@@ -1444,14 +1442,12 @@ 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 e3e4ce5..b7c9a5f 100644
--- 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}