diff options
| author | Ian Lance Taylor <ian@airs.com> | 1997-09-25 16:16:11 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 1997-09-25 16:16:11 +0000 |
| commit | 3359a0bcec3b26b1fa7db918547fde2315f04850 (patch) | |
| tree | 52761f7ed6da54c3be6227641ae4eac00104c616 /bfd | |
| parent | af51b8d56d8b45413757c72e2b26372fa4c96c65 (diff) | |
| download | gdb-3359a0bcec3b26b1fa7db918547fde2315f04850.zip gdb-3359a0bcec3b26b1fa7db918547fde2315f04850.tar.gz gdb-3359a0bcec3b26b1fa7db918547fde2315f04850.tar.bz2 | |
* elflink.h (elf_merge_symbol): Don't check the hash creator until
after we have set *sym_hash.
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/elflink.h | 10 |
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 |