summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authormarius <marius@FreeBSD.org>2006-06-08 13:10:51 +0000
committermarius <marius@FreeBSD.org>2006-06-08 13:10:51 +0000
commit57a37235900f393f710b14ca62708cdd3a502ecb (patch)
tree4e007e4554d36e4d78b3ea08e772e7b8b3b7c893 /contrib
parent4dd02491697479c51d08688bd5e22d78556524af (diff)
parentf5e830d091704c984593d6fe745fe30c4036c944 (diff)
downloadFreeBSD-src-57a37235900f393f710b14ca62708cdd3a502ecb.zip
FreeBSD-src-57a37235900f393f710b14ca62708cdd3a502ecb.tar.gz
This commit was generated by cvs2svn to compensate for changes in r159399,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/binutils/bfd/elf64-sparc.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/binutils/bfd/elf64-sparc.c b/contrib/binutils/bfd/elf64-sparc.c
index 4568a22..90de3b9 100644
--- a/contrib/binutils/bfd/elf64-sparc.c
+++ b/contrib/binutils/bfd/elf64-sparc.c
@@ -1638,7 +1638,11 @@ sparc64_elf_adjust_dynamic_symbol (info, h)
|| h->root.type == bfd_link_hash_defweak)
&& (h->root.u.def.section->flags & SEC_CODE) != 0))
{
- if (! elf_hash_table (info)->dynamic_sections_created)
+ if (! info->shared
+ && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
+ && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0
+ && h->root.type != bfd_link_hash_undefweak
+ && h->root.type != bfd_link_hash_undefined)
{
/* This case can occur if we saw a WPLT30 reloc in an input
file, but none of the input files were dynamic objects.
OpenPOWER on IntegriCloud