From 3359a0bcec3b26b1fa7db918547fde2315f04850 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 25 Sep 1997 16:16:11 +0000 Subject: [PATCH] * elflink.h (elf_merge_symbol): Don't check the hash creator until after we have set *sym_hash. --- bfd/elflink.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bfd/elflink.h b/bfd/elflink.h index 3898116a645..974d8f06c12 100644 --- a/bfd/elflink.h +++ b/bfd/elflink.h @@ -298,11 +298,6 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash, bfd *oldbfd; boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon; - /* This code is for coping with dynamic objects, and is only useful - if we are doing an ELF link. */ - if (info->hash->creator != abfd->xvec) - return true; - *override = false; *type_change_ok = false; *size_change_ok = false; @@ -319,6 +314,11 @@ elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash, return false; *sym_hash = h; + /* This code is for coping with dynamic objects, and is only useful + if we are doing an ELF link. */ + if (info->hash->creator != abfd->xvec) + return true; + /* For merging, we only care about real symbols. */ while (h->root.type == bfd_link_hash_indirect -- 2.30.2