OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct parameter names for elf_x86_64_merge_symbol. 

2011-04-30  H.J. Lu  <hongjiu.lu@intel.com>

	* elf64-x86-64.c (elf_x86_64_merge_symbol): Correct parameter
	names.
This commit is contained in:
H.J. Lu 2011-04-30 17:56:35 +00:00
parent e17de01501
commit 71e7aa7dc6
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -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.

12
bfd/elf64-x86-64.c
View File

@ -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)
{