summaryrefslogtreecommitdiff
path: root/gnu/usr.bin/binutils/bfd/elf32-m68k.c
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2001-06-09 22:29:42 +0000
committerMarc Espie <espie@cvs.openbsd.org>2001-06-09 22:29:42 +0000
commitb087ddea52407e4a9b8fe07d0ad234d36379fb67 (patch)
treeeb75e416899d445ace73b11fb08d1328b3a1f368 /gnu/usr.bin/binutils/bfd/elf32-m68k.c
parentfcab77976ead6644881c2eb7bb3499cdfabed685 (diff)
Automatic cvs merge. Dread what I will have to fix after this excuse
of a program is done...
Diffstat (limited to 'gnu/usr.bin/binutils/bfd/elf32-m68k.c')
-rw-r--r--gnu/usr.bin/binutils/bfd/elf32-m68k.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/bfd/elf32-m68k.c b/gnu/usr.bin/binutils/bfd/elf32-m68k.c
index cc622301755..3df26d2c7f9 100644
--- a/gnu/usr.bin/binutils/bfd/elf32-m68k.c
+++ b/gnu/usr.bin/binutils/bfd/elf32-m68k.c
@@ -1479,14 +1479,17 @@ elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
}
else if (h->root.type == bfd_link_hash_undefweak)
relocation = 0;
- else if (info->shared && !info->symbolic && !info->no_undefined)
+ else if (info->shared && !info->symbolic
+ && !info->no_undefined
+ && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
relocation = 0;
else
{
if (!(info->callbacks->undefined_symbol
(info, h->root.root.string, input_bfd,
input_section, rel->r_offset,
- (!info->shared || info->no_undefined))))
+ (!info->shared || info->no_undefined
+ || ELF_ST_VISIBILITY (h->other)))))
return false;
relocation = 0;
}