From 79cda7cfd96f285005635032a5bcd082a112d8a1 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Fri, 5 Mar 2004 23:50:54 +0000 Subject: [PATCH] Reviewed and approved by Alan Modra 2004-03-05 Fred Fish * elfxx-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Just force mips16 symbols to be even rather than testing first for even/odd. (_bfd_mips_elf_link_output_symbol_hook): Ditto. --- bfd/ChangeLog | 6 ++++++ bfd/elfxx-mips.c | 12 +++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c16e003abc5..de8ec454797 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2004-03-05 Fred Fish + + * elfxx-mips.c (_bfd_mips_elf_finish_dynamic_symbol): Just force + mips16 symbols to be even rather than testing first for even/odd. + (_bfd_mips_elf_link_output_symbol_hook): Ditto. + 2004-03-05 Nathan Sidwell * elf.c (map_sections_to_segments): Ignore .tbss sections for diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c index f072f2627dd..17d5b02bc26 100644 --- a/bfd/elfxx-mips.c +++ b/bfd/elfxx-mips.c @@ -1,6 +1,6 @@ /* MIPS-specific support for ELF Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, - 2003 Free Software Foundation, Inc. + 2003, 2004 Free Software Foundation, Inc. Most of the information added by Ian Lance Taylor, Cygnus Support, . @@ -4891,9 +4891,8 @@ _bfd_mips_elf_link_output_symbol_hook && strcmp (input_sec->name, ".scommon") == 0) sym->st_shndx = SHN_MIPS_SCOMMON; - if (sym->st_other == STO_MIPS16 - && (sym->st_value & 1) != 0) - --sym->st_value; + if (sym->st_other == STO_MIPS16) + sym->st_value &= ~1; return TRUE; } @@ -6814,9 +6813,8 @@ _bfd_mips_elf_finish_dynamic_symbol (bfd *output_bfd, } /* If this is a mips16 symbol, force the value to be even. */ - if (sym->st_other == STO_MIPS16 - && (sym->st_value & 1) != 0) - --sym->st_value; + if (sym->st_other == STO_MIPS16) + sym->st_value &= ~1; return TRUE; }