* elf-m10300.c (mn10300_elf_relax_section): Handle non-section

        symbols with SEC_MERGE flag.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ae57bc3fed89582e5849ef4af70a4dd514b93ce..017a740d560db069551aaede6cc793333edd829a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-25  Nick Clifton  <nickc@redhat.com>
+
+       * elf-m10300.c (mn10300_elf_relax_section): Handle non-section
+       symbols with SEC_MERGE flag.
+
 2009-06-25  Kai Tietz  <kai.tietz@onevision.com>
 
        * coffcode.h (sec_to_styp_flags): Set discardable for .reloc and

diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index d3270c5dbb87ec502d73ab964d06a4b0f28512a0..a58be7b6b76405535dd3495ee262584ec8d52107 100644 (file)
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -2781,7 +2781,6 @@ mn10300_elf_relax_section (bfd *abfd,
                                                      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;