From 177b4a6ad0047c8995fbc55016bc4f4b68d53b4a Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 18 Mar 2002 18:56:18 +0000 Subject: [PATCH] * config/tc-mips.c (md_estimate_size_before_relax): Do not modify the EXTENDED bit here; report the estimate according to the current size. --- gas/ChangeLog | 6 ++++++ gas/config/tc-mips.c | 15 +++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index f6331af5851..b9183602136 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2002-03-18 Alexandre Oliva + + * config/tc-mips.c (md_estimate_size_before_relax): Do not modify + the EXTENDED bit here; report the estimate according to the + current size. + 2002-03-18 Tom Rix * configure.in: Add AIX 5 support. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 54d24befdba..8cc0a823226 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -12193,18 +12193,9 @@ md_estimate_size_before_relax (fragp, segtype) boolean linkonce = false; if (RELAX_MIPS16_P (fragp->fr_subtype)) - { - if (mips16_extended_frag (fragp, segtype, 0)) - { - fragp->fr_subtype = RELAX_MIPS16_MARK_EXTENDED (fragp->fr_subtype); - return 4; - } - else - { - fragp->fr_subtype = RELAX_MIPS16_CLEAR_EXTENDED (fragp->fr_subtype); - return 2; - } - } + /* We don't want to modify the EXTENDED bit here; it might get us + into infinite loops. We change it only in mips_relax_frag(). */ + return (RELAX_MIPS16_EXTENDED (fragp->fr_subtype) ? 4 : 2); if (mips_pic == NO_PIC) { -- 2.30.2