Module Name: src
Committed By: matt
Date: Sun Mar 4 17:09:33 UTC 2012
Modified Files:
src/external/gpl3/binutils/dist/bfd: elflink.c
Log Message:
Fix merge botch dealing with linker assignments.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/binutils/dist/bfd/elflink.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/bfd/elflink.c
diff -u src/external/gpl3/binutils/dist/bfd/elflink.c:1.5 src/external/gpl3/binutils/dist/bfd/elflink.c:1.6
--- src/external/gpl3/binutils/dist/bfd/elflink.c:1.5 Sat Nov 26 15:59:34 2011
+++ src/external/gpl3/binutils/dist/bfd/elflink.c Sun Mar 4 17:09:32 2012
@@ -567,10 +567,7 @@ bfd_elf_record_link_assignment (bfd *out
&& !h->def_regular)
h->verinfo.verdef = NULL;
- /* Only set symbols not provided from the linker script as regular so
- that we can find their version from verdef not vertree */
- if (!provide)
- h->def_regular = 1;
+ h->def_regular = 1;
if (provide && hidden)
{
