From 71e7aa7dc6d1f82c77f58ae2a2f41225276637a2 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 30 Apr 2011 17:56:35 +0000 Subject: [PATCH] Correct parameter names for elf_x86_64_merge_symbol. 2011-04-30 H.J. Lu * elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter names. --- bfd/ChangeLog | 5 +++++ bfd/elf64-x86-64.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8216abd6611..9cd81e6a054 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2011-04-30 H.J. Lu + + * elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter + names. + 2011-04-28 Tom Tromey * bfdio.c (memory_bstat): Pass correct size to memset. diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index a02b3e8c547..3f725dbda3d 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -4551,14 +4551,14 @@ elf_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED, bfd_boolean *override ATTRIBUTE_UNUSED, bfd_boolean *type_change_ok ATTRIBUTE_UNUSED, bfd_boolean *size_change_ok ATTRIBUTE_UNUSED, - bfd_boolean *newdef ATTRIBUTE_UNUSED, - bfd_boolean *newdyn, + bfd_boolean *newdyn ATTRIBUTE_UNUSED, + bfd_boolean *newdef, bfd_boolean *newdyncommon ATTRIBUTE_UNUSED, bfd_boolean *newweak ATTRIBUTE_UNUSED, bfd *abfd ATTRIBUTE_UNUSED, asection **sec, - bfd_boolean *olddef ATTRIBUTE_UNUSED, - bfd_boolean *olddyn, + bfd_boolean *olddyn ATTRIBUTE_UNUSED, + bfd_boolean *olddef, bfd_boolean *olddyncommon ATTRIBUTE_UNUSED, bfd_boolean *oldweak ATTRIBUTE_UNUSED, bfd *oldbfd, @@ -4567,9 +4567,9 @@ elf_x86_64_merge_symbol (struct bfd_link_info *info ATTRIBUTE_UNUSED, /* A normal common symbol and a large common symbol result in a normal common symbol. We turn the large common symbol into a normal one. */ - if (!*olddyn + if (!*olddef && h->root.type == bfd_link_hash_common - && !*newdyn + && !*newdef && bfd_is_com_section (*sec) && *oldsec != *sec) { -- 2.30.2