aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2009-06-25 15:36:45 +0000
committerNick Clifton <nickc@redhat.com>2009-06-25 15:36:45 +0000
commitbe7035c6b86260fedd9c90a5a69a7c8b537e9dc2 (patch)
tree46a4e865cabc02b924a7fb0bc0712b8208d921cb /bfd
parent204eb8bc8b00846d11fcbb3c7ff198725dc0ddac (diff)
downloadgdb-be7035c6b86260fedd9c90a5a69a7c8b537e9dc2.zip
gdb-be7035c6b86260fedd9c90a5a69a7c8b537e9dc2.tar.gz
gdb-be7035c6b86260fedd9c90a5a69a7c8b537e9dc2.tar.bz2
* elf-m10300.c (mn10300_elf_relax_section): Handle non-section
symbols with SEC_MERGE flag.
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elf-m10300.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3ae57bc..017a740 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 d3270c5..a58be7b 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;