This is the mail archive of the binutils@sourceware.org mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

PATCH: Correct parameter names for elf_x86_64_merge_symbol


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  <hongjiu.lu@intel.com>
+
+	* elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter
+	names.
+
 2011-04-28  Tom Tromey  <tromey@redhat.com>
 
 	* 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)
     {


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]