diff options
| author | Per Fogelstrom <pefo@cvs.openbsd.org> | 1996-09-06 20:51:12 +0000 |
|---|---|---|
| committer | Per Fogelstrom <pefo@cvs.openbsd.org> | 1996-09-06 20:51:12 +0000 |
| commit | 415a483131479053b466eb604593e496b997502b (patch) | |
| tree | 5cdbe39ef79021fd1dc42bbf6b88449aef23fbb1 | |
| parent | 3d6d7f320d454d833f95445e482f3f782184c10b (diff) | |
Resolved import conflict
| -rw-r--r-- | gnu/usr.bin/binutils/bfd/elf32-mips.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gnu/usr.bin/binutils/bfd/elf32-mips.c b/gnu/usr.bin/binutils/bfd/elf32-mips.c index 6fd94a0c34d..1bc95b8d06f 100644 --- a/gnu/usr.bin/binutils/bfd/elf32-mips.c +++ b/gnu/usr.bin/binutils/bfd/elf32-mips.c @@ -4536,8 +4536,8 @@ mips_elf_relocate_section (output_bfd, info, input_bfd, input_section, if ((info->shared || (elf_hash_table (info)->dynamic_sections_created && h != NULL - && ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) - == 0))) + && ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) + != 0))) && (input_section->flags & SEC_ALLOC) != 0) { /* When generating a shared object, these |