From: Chris Demetriou <cgd@google.com>
Date: Tue, 22 Jul 2008 04:58:33 +0000 (+0000)
Subject: 2008-07-22  Simon Baldwin  <simonb@google.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bda987c255396672f917107bb819a99d204c7d89;p=binutils-gdb.git

2008-07-22  Simon Baldwin  <simonb@google.com>

        * elflink.c (elf_link_output_extsym): Set st_size to zero for
        symbols from dynamic libraries.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b5967c95e5d..3616c0f5c18 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-22  Simon Baldwin  <simonb@google.com>
+
+	* elflink.c (elf_link_output_extsym): Set st_size to zero for
+	symbols from dynamic libraries.
+
 2008-07-21  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR ld/4424
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 69a7c6945ce..488f98afdb7 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -8619,6 +8619,15 @@ elf_link_output_extsym (struct elf_link_hash_entry *h, void *data)
       sym.st_info = ELF_ST_INFO (bindtype, ELF_ST_TYPE (sym.st_info));
     }
 
+  /* If this is a symbol defined in a dynamic library, don't use the
+     symbol size from the dynamic library.  Relinking an executable
+     against a new library may introduce gratuitous changes in the
+     executable's symbols if we keep the size.  */
+  if (sym.st_shndx == SHN_UNDEF
+      && !h->def_regular
+      && h->def_dynamic)
+    sym.st_size = 0;
+
   /* If a non-weak symbol with non-default visibility is not defined
      locally, it is a fatal error.  */
   if (! finfo->info->relocatable