PROVIDE in linker script vs. built-in symbols

	* ldexp.c (exp_fold_tree_1 <etree_provide>): Make PROVIDEd
	linker script symbol value override a built-in linker symbol.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9e3303d905fc1293239e0a240057c9eb57912f47..0a8eb7260554f3aa3a9479c26d10c0987233be5c 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,6 +1,10 @@
 2014-06-12  Alan Modra  <amodra@gmail.com>
 
        Backport mainline patches
+       2014-06-07  Alan Modra  <amodra@gmail.com>
+       * ldexp.c (exp_fold_tree_1 <etree_provide>): Make PROVIDEd
+       linker script symbol value override a built-in linker symbol.
+
        2014-02-19  Alan Modra  <amodra@gmail.com>
        * emultempl/ppc64elf.em (params): Init new field.
        (ppc_create_output_section_statements): Set params.save_restore_funcs

diff --git a/ld/ldexp.c b/ld/ldexp.c
index 49e7c65f4176f1d5990ec856a433e30fb978c385..6556b08dfbce367e9097e758fe637e5baa02e057 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -889,7 +889,10 @@ exp_fold_tree_1 (etree_type *tree)
              if (h == NULL
                  || (h->type != bfd_link_hash_new
                      && h->type != bfd_link_hash_undefined
-                     && h->type != bfd_link_hash_common))
+                     && h->type != bfd_link_hash_common
+                     && !(h->type == bfd_link_hash_defined
+                          && (h->u.def.section->flags
+                              & SEC_LINKER_CREATED) != 0)))
                {
                  /* Do nothing.  The symbol was never referenced, or was
                     defined by some object.  */