Don't PROVIDE over top of common symbols

This:
  int end[100000];
  int main(void) { end[99999] = 0; return 0; }
should not segfault.

ld/
	* ldexp.c (exp_fold_tree_1 <etree_provide>): Leave bfd_link_hash_common
	symbols alone.
ld/testsuite/
	* ld-elf/endsym.s, *ld-elf/endsym.d: New test.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 43ce92432ea49e84f3558084aa937f77243be149..f16d1d53076e99ec81b40c626ca95d3e81653d4b 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Alan Modra  <amodra@gmail.com>
+
+       * ldexp.c (exp_fold_tree_1 <etree_provide>): Leave bfd_link_hash_common
+       symbols alone.
+
 2014-12-23  Alan Modra  <amodra@gmail.com>
 
        * ldexp.c (update_definedness): Correct logic setting by_object.

diff --git a/ld/ldexp.c b/ld/ldexp.c
index e9e95f9ddebdd5f5da6f472078a7c06c7df4fbfd..8615869b7293be4eb49863337ae1d3b32e65b856 100644 (file)
--- a/ld/ldexp.c
+++ b/ld/ldexp.c
@@ -1070,15 +1070,15 @@ exp_fold_tree_1 (etree_type *tree)
              h = bfd_link_hash_lookup (link_info.hash, tree->assign.dst,
                                        FALSE, FALSE, TRUE);
              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_defined
+                 || !(h->type == bfd_link_hash_new
+                      || h->type == bfd_link_hash_undefined
+                      || (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.  */
+                 /* Do nothing.  The symbol was never referenced, or
+                    was defined in some object file.  Undefined weak
+                    symbols stay undefined.  */
                  break;
                }
            }

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 9607a1548eaf00339d9fcd4c21137a47c6a6831b..c901bb722bdc7ecc8d295459ded0c6a8da220e73 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-23  Alan Modra  <amodra@gmail.com>
+
+       * ld-elf/endsym.s, *ld-elf/endsym.d: New test.
+
 2014-12-19  Matthew Fortune  <matthew.fortune@imgtec.com>
 
        * ld-mips-elf/attr-gnu-4-00.d: Relax check for ISA extension.

diff --git a/ld/testsuite/ld-elf/endsym.d b/ld/testsuite/ld-elf/endsym.d
new file mode 100644 (file)
index 0000000..912d3de
--- /dev/null
+++ b/ld/testsuite/ld-elf/endsym.d
@@ -0,0 +1,13 @@
+#source: start.s
+#source: endsym.s
+#ld: --sort-common
+#nm: -n
+#notarget: hppa*-*-hpux*
+
+#...
+.* end
+#...
+.* end2
+#...
+.* _?_end
+#pass

diff --git a/ld/testsuite/ld-elf/endsym.s b/ld/testsuite/ld-elf/endsym.s
new file mode 100644 (file)
index 0000000..5255c04
--- /dev/null
+++ b/ld/testsuite/ld-elf/endsym.s
@@ -0,0 +1,2 @@
+ .comm end,4,4
+ .comm end2,2,2