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

symbols with SEC_MERGE flag.

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

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;