23 lines
797 B
Diff
23 lines
797 B
Diff
*** ../binutils-2.24.orig/bfd/elflink.c 2014-08-15 14:12:59.933394436 +0100
|
|
--- bfd/elflink.c 2014-08-15 14:40:54.787075416 +0100
|
|
*************** _bfd_elf_merge_symbol (bfd *abfd,
|
|
*** 1437,1443 ****
|
|
if (!(oldbfd != NULL
|
|
&& (oldbfd->flags & BFD_PLUGIN) != 0
|
|
&& (abfd->flags & BFD_PLUGIN) == 0))
|
|
! *skip = TRUE;
|
|
|
|
/* Merge st_other. If the symbol already has a dynamic index,
|
|
but visibility says it should not be visible, turn it into a
|
|
--- 1437,1446 ----
|
|
if (!(oldbfd != NULL
|
|
&& (oldbfd->flags & BFD_PLUGIN) != 0
|
|
&& (abfd->flags & BFD_PLUGIN) == 0))
|
|
! {
|
|
! newdef = FALSE;
|
|
! *skip = TRUE;
|
|
! }
|
|
|
|
/* Merge st_other. If the symbol already has a dynamic index,
|
|
but visibility says it should not be visible, turn it into a
|