[v2,3/3] ld/testsuite: Add comprehensive PE COFF weak external tests

diff --git a/ld/testsuite/ld-pe/pe-compile.exp b/ld/testsuite/ld-pe/pe-compile.exp
index 041a1cb9344..189b95ea315 100644
--- a/ld/testsuite/ld-pe/pe-compile.exp
+++ b/ld/testsuite/ld-pe/pe-compile.exp
@@ -138,3 +138,91 @@  set align_tests {
 }
 
 run_ld_link_tests $align_tests
+
+# Test PE COFF weak external symbol resolution.
+# These tests cover the full matrix of weak/strong interactions to verify
+# that the linker correctly resolves weak externals in PE COFF objects.
+# Based on testcases by Martin Storsjo.
+
+proc weak_ext_test { testname sources } {
+    global CC_FOR_TARGET
+    global srcdir
+    global subdir
+
+    set objfiles {}
+    foreach src $sources {
+	set fileroot [file rootname [file tail $src]]
+	set obj "tmpdir/$fileroot.o"
+	if ![ld_compile $CC_FOR_TARGET $srcdir/$subdir/$src $obj] {
+	    fail "$testname (compile $src)"
+	    return
+	}
+	lappend objfiles $obj
+    }
+
+    set output "tmpdir/weak-ext-test.exe"
+    if ![ld_link $CC_FOR_TARGET $output $objfiles] {
+	fail "$testname (link)"
+	return
+    }
+
+    if ![isnative] {
+	pass "$testname (link only)"
+	return
+    }
+
+    catch "exec $output" prog_output
+    if { $prog_output eq "" } {
+	pass $testname
+    } else {
+	verbose $prog_output
+	fail "$testname ($prog_output)"
+    }
+}
+
+# Strong undefined reference + strong definition: basic sanity check.
+weak_ext_test "weak external: normal (strong undef + strong def)" \
+    {weak-ext-main.c weak-ext-add2.c weak-ext-expected3.c weak-ext-dummy.c}
+
+# Weak declaration with no definition available: func remains NULL,
+# never called.
+weak_ext_test "weak external: weak undef (no def)" \
+    {weak-ext-main-weak.c weak-ext-expected1.c weak-ext-dummy.c}
+
+# Weak declaration resolved by a strong definition in another object.
+weak_ext_test "weak external: weak decl + strong def" \
+    {weak-ext-main-weak.c weak-ext-add2.c weak-ext-expected3.c weak-ext-dummy.c}
+
+# Two weak externals for the same symbol meet: the one whose fallback
+# alias points to an actual function body should win over the one whose
+# fallback is NULL.
+weak_ext_test "weak external: weak decl + weak def" \
+    {weak-ext-main-weak.c weak-ext-add1-weak-chained.c weak-ext-expected3.c}
+
+# Strong undefined reference is seen before the weak definition: the
+# linker must still store the weak external's aux record so the fallback
+# alias can be resolved later.
+weak_ext_test "weak external: strong undef + weak def" \
+    {weak-ext-main.c weak-ext-add1-weak-chained.c weak-ext-expected3.c}
+
+# Strong definition overrides a weak definition: both call sites (in
+# main and in dummy) should resolve to the strong def.
+weak_ext_test "weak external: strong override of weak" \
+    {weak-ext-main.c weak-ext-add1-weak-chained.c weak-ext-add2.c \
+     weak-ext-expected5.c}
+
+# Two identical weak definitions for the same symbol: no conflict,
+# the linker picks one (first wins) and discards the duplicate.
+weak_ext_test "weak external: duplicate weak defs" \
+    {weak-ext-main.c weak-ext-add1-weak-chained.c \
+     weak-ext-expected3-add1-weak.c}
+
+# Weak definition in main overridden by a strong definition elsewhere.
+weak_ext_test "weak external: weak def overridden by strong" \
+    {weak-ext-main-weak-def.c weak-ext-add2.c weak-ext-expected3.c \
+     weak-ext-dummy.c}
+
+# Weak definition in main used directly when no strong definition exists.
+weak_ext_test "weak external: weak def used (no strong)" \
+    {weak-ext-main-weak-def.c weak-ext-expected5.c weak-ext-dummy.c}
+
diff --git a/ld/testsuite/ld-pe/weak-ext-add1-weak-chained.c b/ld/testsuite/ld-pe/weak-ext-add1-weak-chained.c
new file mode 100644
index 00000000000..5b68b8435e2
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-add1-weak-chained.c
@@ -0,0 +1,13 @@ 
+/* Weak definition of func (adds 1), plus dummy that calls func.  */
+extern int value;
+
+__attribute__((weak)) void func (void)
+{
+  value += 1;
+}
+
+void
+dummy (void)
+{
+  func ();
+}
diff --git a/ld/testsuite/ld-pe/weak-ext-add2.c b/ld/testsuite/ld-pe/weak-ext-add2.c
new file mode 100644
index 00000000000..691554d17e3
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-add2.c
@@ -0,0 +1,8 @@ 
+/* Strong definition of func (adds 2).  */
+extern int value;
+
+void
+func (void)
+{
+  value += 2;
+}
diff --git a/ld/testsuite/ld-pe/weak-ext-dummy.c b/ld/testsuite/ld-pe/weak-ext-dummy.c
new file mode 100644
index 00000000000..1c97c3cf97f
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-dummy.c
@@ -0,0 +1,5 @@ 
+/* Empty dummy function.  */
+void
+dummy (void)
+{
+}
diff --git a/ld/testsuite/ld-pe/weak-ext-expected1.c b/ld/testsuite/ld-pe/weak-ext-expected1.c
new file mode 100644
index 00000000000..5b4138b0bb1
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-expected1.c
@@ -0,0 +1 @@ 
+int expected = 1;
diff --git a/ld/testsuite/ld-pe/weak-ext-expected3-add1-weak.c b/ld/testsuite/ld-pe/weak-ext-expected3-add1-weak.c
new file mode 100644
index 00000000000..585830bd304
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-expected3-add1-weak.c
@@ -0,0 +1,9 @@ 
+/* Second weak definition of func (adds 1) plus expected value.  */
+extern int value;
+
+__attribute__((weak)) void func (void)
+{
+  value += 1;
+}
+
+int expected = 3;
diff --git a/ld/testsuite/ld-pe/weak-ext-expected3.c b/ld/testsuite/ld-pe/weak-ext-expected3.c
new file mode 100644
index 00000000000..3d67d70bcb0
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-expected3.c
@@ -0,0 +1 @@ 
+int expected = 3;
diff --git a/ld/testsuite/ld-pe/weak-ext-expected5.c b/ld/testsuite/ld-pe/weak-ext-expected5.c
new file mode 100644
index 00000000000..fef6b322c03
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-expected5.c
@@ -0,0 +1 @@ 
+int expected = 5;
diff --git a/ld/testsuite/ld-pe/weak-ext-main-weak-def.c b/ld/testsuite/ld-pe/weak-ext-main-weak-def.c
new file mode 100644
index 00000000000..05f81d189b4
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-main-weak-def.c
@@ -0,0 +1,26 @@ 
+/* Weak definition of func in main (adds 4).  */
+#include <stdio.h>
+
+int value = 1;
+
+__attribute__((weak)) void func (void)
+{
+  value += 4;
+}
+
+void dummy (void);
+extern int expected;
+
+int
+main (void)
+{
+  if (func)
+    func ();
+  dummy ();
+  if (value != expected)
+    {
+      printf ("expected %d, got %d\n", expected, value);
+      return 1;
+    }
+  return 0;
+}
diff --git a/ld/testsuite/ld-pe/weak-ext-main-weak.c b/ld/testsuite/ld-pe/weak-ext-main-weak.c
new file mode 100644
index 00000000000..bc1501f62c0
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-main-weak.c
@@ -0,0 +1,22 @@ 
+/* Weak declaration of func (no definition).  */
+#include <stdio.h>
+
+__attribute__((weak)) void func (void);
+void dummy (void);
+
+int value = 1;
+extern int expected;
+
+int
+main (void)
+{
+  if (func)
+    func ();
+  dummy ();
+  if (value != expected)
+    {
+      printf ("expected %d, got %d\n", expected, value);
+      return 1;
+    }
+  return 0;
+}
diff --git a/ld/testsuite/ld-pe/weak-ext-main.c b/ld/testsuite/ld-pe/weak-ext-main.c
new file mode 100644
index 00000000000..916bb246e5f
--- /dev/null
+++ b/ld/testsuite/ld-pe/weak-ext-main.c
@@ -0,0 +1,21 @@ 
+/* Strong undefined reference to func.  */
+#include <stdio.h>
+
+void func (void);
+void dummy (void);
+
+int value = 1;
+extern int expected;
+
+int
+main (void)
+{
+  func ();
+  dummy ();
+  if (value != expected)
+    {
+      printf ("expected %d, got %d\n", expected, value);
+      return 1;
+    }
+  return 0;
+}