From 2d2bf3e0e31c3255978b2769c9f75520349c5752 Mon Sep 17 00:00:00 2001 From: Chris Demetriou Date: Thu, 14 Feb 2002 07:29:22 +0000 Subject: [PATCH] 2002-02-13 Chris Demetriou * config/tc-mips.c (mips_need_elf_addend_fixup): Restructure into a sequence of indpendent 'if' statements for easier debugging and future modification. --- gas/ChangeLog | 6 ++++++ gas/config/tc-mips.c | 26 +++++++++++++++----------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 7c1608ae8e..eb5346d5ce 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2002-02-13 Chris Demetriou + + * config/tc-mips.c (mips_need_elf_addend_fixup): Restructure into + a sequence of indpendent 'if' statements for easier debugging + and future modification. + 2002-02-13 Matt Fredette * config/tc-m68k.c (md_show_usage): No longer display a diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index d64d4eb3e5..ec0bf25e8b 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -10404,17 +10404,21 @@ static int mips_need_elf_addend_fixup (fixP) fixS *fixP; { - return (S_GET_OTHER (fixP->fx_addsy) == STO_MIPS16 - || ((S_IS_WEAK (fixP->fx_addsy) - || S_IS_EXTERN (fixP->fx_addsy)) - && !S_IS_COMMON (fixP->fx_addsy)) - || (symbol_used_in_reloc_p (fixP->fx_addsy) - && (((bfd_get_section_flags (stdoutput, - S_GET_SEGMENT (fixP->fx_addsy)) - & SEC_LINK_ONCE) != 0) - || !strncmp (segment_name (S_GET_SEGMENT (fixP->fx_addsy)), - ".gnu.linkonce", - sizeof (".gnu.linkonce") - 1)))); + if (S_GET_OTHER (fixP->fx_addsy) == STO_MIPS16) + return 1; + if ((S_IS_WEAK (fixP->fx_addsy) + || S_IS_EXTERN (fixP->fx_addsy)) + && !S_IS_COMMON (fixP->fx_addsy)) + return 1; + if (symbol_used_in_reloc_p (fixP->fx_addsy) + && (((bfd_get_section_flags (stdoutput, + S_GET_SEGMENT (fixP->fx_addsy)) + & SEC_LINK_ONCE) != 0) + || !strncmp (segment_name (S_GET_SEGMENT (fixP->fx_addsy)), + ".gnu.linkonce", + sizeof (".gnu.linkonce") - 1))) + return 1; + return 0; } #endif