From ec4fcab0ee2877e2dd33528b2be34fa90c00e0b7 Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Tue, 21 Jul 2020 01:59:24 +0100 Subject: [PATCH] MIPS/GAS: Remove stale `prev_reloc_op_frag' variable Ever since commit 4d7206a284ee ("Rework MIPS macro relaxation, fix string merging bug"), , `prev_reloc_op_frag' has only been set and never used. Remove it then. gas/ * config/tc-mips.c (prev_reloc_op_frag): Remove variable. (my_getSmallExpression): Adjust accordingly. --- gas/ChangeLog | 5 +++++ gas/config/tc-mips.c | 13 ++----------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 2aed48f181d..38cbe1cfeb9 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2020-07-21 Maciej W. Rozycki + + * config/tc-mips.c (prev_reloc_op_frag): Remove variable. + (my_getSmallExpression): Adjust accordingly. + 2020-07-20 Jan Beulich PR gas/4572 diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 31acb77d78a..2d85cb5da1a 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -889,11 +889,6 @@ struct mips_hi_fixup static struct mips_hi_fixup *mips_hi_fixup_list; -/* The frag containing the last explicit relocation operator. - Null if explicit relocations have not been used. */ - -static fragS *prev_reloc_op_frag; - /* Map mips16 register numbers to normal MIPS register numbers. */ static const unsigned int mips16_to_32_reg_map[] = @@ -14720,12 +14715,8 @@ my_getSmallExpression (expressionS *ep, bfd_reloc_code_real_type *reloc, expr_end = str; - if (reloc_index != 0) - { - prev_reloc_op_frag = frag_now; - for (i = 0; i < reloc_index; i++) - reloc[i] = reversed_reloc[reloc_index - 1 - i]; - } + for (i = 0; i < reloc_index; i++) + reloc[i] = reversed_reloc[reloc_index - 1 - i]; return reloc_index; } -- 2.30.2