aboutsummaryrefslogtreecommitdiff
path: root/bfd/elflink.h
diff options
context:
space:
mode:
Diffstat (limited to 'bfd/elflink.h')
-rw-r--r--bfd/elflink.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/bfd/elflink.h b/bfd/elflink.h
index 3898116..974d8f0 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