From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23768 invoked by alias); 30 Apr 2011 17:57:57 -0000 Received: (qmail 23758 invoked by uid 22791); 30 Apr 2011 17:57:56 -0000 X-SWARE-Spam-Status: No, hits=-1.4 required=5.0 tests=AWL,BAYES_00,NO_DNS_FOR_FROM,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga02.intel.com (HELO mga02.intel.com) (134.134.136.20) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 30 Apr 2011 17:57:42 +0000 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 30 Apr 2011 10:57:42 -0700 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by orsmga002.jf.intel.com with ESMTP; 30 Apr 2011 10:57:42 -0700 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id BF3FC180F39; Sat, 30 Apr 2011 10:57:41 -0700 (PDT) Date: Sat, 30 Apr 2011 17:57:00 -0000 From: "H.J. Lu" To: binutils@sourceware.org Subject: PATCH: Correct parameter names for elf_x86_64_merge_symbol Message-ID: <20110430175741.GA22530@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Mailing-List: contact binutils-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: binutils-owner@sourceware.org X-SW-Source: 2011-04/txt/msg00441.txt.bz2 Hi, I checked in this patch to make parameter names for elf_x86_64_merge_symbol with caller. H.J. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 8216abd..9cd81e6 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 a02b3e8..3f725db 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) {