Committed: Fix MN10300 linker relaxation against non-section merged symbols

[Nick Clifton]

Hi Guys,

  I am checking in the patch below to fix a problem with the MN10300
  port's linker relaxation,  It was not computing the correct values
  for symbols in mergeable sections when the symbol was not also the
  section symbol.

Cheers
  Nick

bfd/ChangeLog
2009-06-24  Nick Clifton  <nickc@redhat.com>

      * elf-m10300.c (mn10300_elf_relax_section): Handle non-section
      symbols with SEC_MERGE flag.

Index: bfd/elf-m10300.c
===================================================================
RCS file: /cvs/src/src/bfd/elf-m10300.c,v
retrieving revision 1.97
diff -c -3 -p -r1.97 elf-m10300.c
*** bfd/elf-m10300.c    27 May 2009 13:31:23 -0000      1.97
--- bfd/elf-m10300.c    25 Jun 2009 13:36:27 -0000
*************** mn10300_elf_relax_section (bfd *abfd,
*** 2781,2787 ****
                                                      isym->st_name);
  
          if ((sym_sec->flags & SEC_MERGE)
-             && ELF_ST_TYPE (isym->st_info) == STT_SECTION
              && sym_sec->sec_info_type == ELF_INFO_TYPE_MERGE)
            {
              symval = isym->st_value + irel->r_addend;