From b4b8f63f6c193c99d885ce9e896fecc83cdc4c2c Mon Sep 17 00:00:00 2001 From: pefo Date: Fri, 6 Sep 1996 20:51:11 +0000 Subject: [PATCH] Resolved import conflict --- gnu/usr.bin/binutils/bfd/elf32-mips.c | 4 ++-- 1 file 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 -- 2.20.1