summaryrefslogtreecommitdiff
path: root/bfd/elflink.c
diff options
context:
space:
mode:
authorAlan Modra <amodra@bigpond.net.au>2005-07-26 15:19:37 +0000
committerAlan Modra <amodra@bigpond.net.au>2005-07-26 15:19:37 +0000
commit0247c8f45951bf1fd80fb07328607bbdee1845b4 (patch)
tree7e6bd43b2817a5f3f4b7f9fb6c82f1bdff415803 /bfd/elflink.c
parente8e1c7ed2a093e8a80431787f4795bd20ca45d8c (diff)
downloadbinutils-redhat-0247c8f45951bf1fd80fb07328607bbdee1845b4.tar.gz
* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
regardless of strength of previous definition.
Diffstat (limited to 'bfd/elflink.c')
-rw-r--r--bfd/elflink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 102b895f0a..98fee0ce4b 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1216,7 +1216,7 @@ _bfd_elf_merge_symbol (bfd *abfd,
}
/* Skip weak definitions of symbols that are already defined. */
- if (newdef && olddef && newweak && !oldweak)
+ if (newdef && olddef && newweak)
*skip = TRUE;
/* If the old symbol is from a dynamic object, and the new symbol is