[src/trunk]: src/external/gpl3/binutils/dist/bfd Fix merge botch dealing with...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ad02b6e5e6eb
branches:  trunk
changeset: 777789:ad02b6e5e6eb
user:      matt <matt%NetBSD.org@localhost>
date:      Sun Mar 04 17:09:32 2012 +0000

description:
Fix merge botch dealing with linker assignments.

diffstat:

 external/gpl3/binutils/dist/bfd/elflink.c |  5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diffs (15 lines):

diff -r bef3459586c6 -r ad02b6e5e6eb external/gpl3/binutils/dist/bfd/elflink.c
--- a/external/gpl3/binutils/dist/bfd/elflink.c Sun Mar 04 16:14:48 2012 +0000
+++ b/external/gpl3/binutils/dist/bfd/elflink.c Sun Mar 04 17:09:32 2012 +0000
@@ -567,10 +567,7 @@
       && !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)
     {