diff options
| author | Alan Modra <amodra@gmail.com> | 2005-07-26 15:19:37 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2005-07-26 15:19:37 +0000 |
| commit | f41d945baeff0467b6f35aba7a3d54ec916f90af (patch) | |
| tree | 575f0cb273e225918f013775467219adcd7e9e4e | |
| parent | 87538722bef4cace47cfb29d79ecab3a2de0a962 (diff) | |
| download | gdb-f41d945baeff0467b6f35aba7a3d54ec916f90af.zip gdb-f41d945baeff0467b6f35aba7a3d54ec916f90af.tar.gz gdb-f41d945baeff0467b6f35aba7a3d54ec916f90af.tar.bz2 | |
* elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition
regardless of strength of previous definition.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elflink.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 062d9e4..ff5c1bc 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2005-07-27 Alan Modra <amodra@bigpond.net.au> + + * elflink.c (_bfd_elf_merge_symbol): Skip weak redefinition + regardless of strength of previous definition. + 2005-07-26 Alan Modra <amodra@bigpond.net.au> * elflink.c (elf_gc_mark_dynamic_ref_symbol): Handle -shared. diff --git a/bfd/elflink.c b/bfd/elflink.c index 102b895..98fee0c 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 |