From: Nick Clifton <nickc@redhat.com>
Date: Thu, 25 Jun 2009 15:36:45 +0000 (+0000)
Subject:         * elf-m10300.c (mn10300_elf_relax_section): Handle non-section
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c8c831dcb40abc7257b17cece36a6ec00d61cf8f;p=pf3gnuchains%2Fpf3gnuchains3x.git

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

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ae57bc3fe..017a740d56 100644
--- 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 d3270c5dbb..a58be7b6b7 100644
--- 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;