Add undefined weak function tests

	* testsuite/ld-undefined/weak-fundef.s: New.
	* testsuite/ld-undefined/weak-undef.t: Don't specify filename.
	* testsuite/ld-undefined/weak-undef.exp: Run new tests.  Rearrange
	much of old code.  Use is_elf_format to select targets.

4 files changed, 91 insertions, 45 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 35e066e8dfd..6c70b54b131 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-08-12  Alan Modra  <amodra@gmail.com>
+
+	* testsuite/ld-undefined/weak-fundef.s: New.
+	* testsuite/ld-undefined/weak-undef.t: Don't specify filename.
+	* testsuite/ld-undefined/weak-undef.exp: Run new tests.  Rearrange
+	much of old code.  Use is_elf_format to select targets.
+
 2016-08-11  Alan Modra  <amodra@gmail.com>
 
 	PR ld/20436
diff --git a/ld/testsuite/ld-undefined/weak-fundef.s b/ld/testsuite/ld-undefined/weak-fundef.s
new file mode 100644
index 00000000000..2c20f799417
--- /dev/null
+++ b/ld/testsuite/ld-undefined/weak-fundef.s
@@ -0,0 +1,14 @@
+	.text
+	.weak undef_weak_fun
+	.type undef_weak_fun %function
+ .ifdef BL
+	bl undef_weak_fun
+	nop
+ .endif
+ .ifdef CALLPLT
+	call undef_weak_fun@plt
+ .endif
+ .ifdef HPPA
+	bl undef_weak_fun,%r2
+	nop
+ .endif
diff --git a/ld/testsuite/ld-undefined/weak-undef.exp b/ld/testsuite/ld-undefined/weak-undef.exp
index c53d73e960b..127628ff9af 100644
--- a/ld/testsuite/ld-undefined/weak-undef.exp
+++ b/ld/testsuite/ld-undefined/weak-undef.exp
@@ -18,67 +18,92 @@
 # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
 # MA 02110-1301, USA.
 
-set testname "weak undefined symbols"
-
-# This test only works for ELF targets.  It ought to work for some
-# a.out targets, but it doesn't.
+# The linker should accept references to undefined weaks without error,
+# and resolve them to zero in a static executable.  Ought to work for
+# some a.out targets too.
+set testname "weak undefined data symbols"
 
-if { ![istarget *-*-sysv4*] \
-     && ![istarget *-*-unixware*] \
-     && ![istarget *-*-elf*] \
-     && ![istarget *-*-eabi*] \
-     && ![istarget hppa*64*-*-hpux*] \
-     && ![istarget *-*-linux*] \
-     && ![istarget *-*-gnu*] \
-     && ![istarget *-*-nacl*] \
-     && ![istarget *-*-irix5*] \
-     && ![istarget *-*-irix6*] \
-     && ![is_pecoff_format] \
-     && ![istarget *-*-solaris2*] } then {
+if { ![is_elf_format] && ![is_pecoff_format] } then {
     unsupported $testname
-    return
-}
+} elseif {![ld_assemble $as $srcdir/$subdir/weak-undef.s \
+	    tmpdir/weak-undef.o]} then {
+    # It's OK if .weak doesn't work on this target.
+    unresolved $testname
+} elseif {![ld_simple_link $ld tmpdir/weak-undef \
+		"tmpdir/weak-undef.o -T $srcdir/$subdir/weak-undef.t"]} then {
+    # Weak symbols are broken for non-i386 PE targets.
+    if {! [istarget i?86-*-*]} {
+	setup_xfail *-*-pe*
+    }
+    setup_xfail pj-*-*
+    fail $testname
+} elseif {![is_remote host] && [which $objdump] == 0} then {
+    unresolved $testname
+} else {
+    set exec_output [run_host_cmd "$objdump" "-s tmpdir/weak-undef"]
+    set exec_output [prune_warnings $exec_output]
+    verbose -log $exec_output
 
-if { [istarget *-*-linux*aout*] \
-     || [istarget *-*-linux*oldld*] } {
-    unsupported $testname
-    return
-}
+    set output_regexp ".*Contents of section .data:.*0000 00000000 11111111.*"
 
-# Weak symbols are broken for non-i386 PE targets.
-if {! [istarget i?86-*-*]} {
-    setup_xfail *-*-pe*
+    if {[regexp $output_regexp $exec_output]} then {
+	pass $testname
+    } else {
+	fail $testname
+    }
 }
 
-setup_xfail pj-*-*
+# When linking a shared lib, weak undefined symbols should become dynamic.
+set testname "weak undefined function symbols in shared lib"
 
-if {! [ld_assemble $as $srcdir/$subdir/weak-undef.s tmpdir/weak-undef.o]} then {
-    # It's OK if .weak doesn't work on this target.
-    unresolved $testname
-    return
+set asflags ""
+switch -glob $target_triplet {
+    aarch64* -
+    arm* -
+    powerpc* { set asflags "--defsym BL=1" }
+    hppa* { set asflags "--defsym HPPA=1" }
+    i\[3-7\]86* -
+    x86_64* { set asflags "--defsym CALLPLT=1" }
 }
 
-# The linker should accept references to undefined weaks without error,
-# and resolve them to zero.
-
-set output_regexp \
-".*Contents of section .data:.*0000 00000000 11111111.*"
-
-if {! [ld_simple_link $ld tmpdir/weak-undef "$flags tmpdir/weak-undef.o -T $srcdir/$subdir/weak-undef.t"] } then {
+if { $asflags == "" || ![is_elf_format] || ![check_shared_lib_support]} then {
+    unresolved $testname
+} elseif {![ld_assemble $as "$asflags $srcdir/$subdir/weak-fundef.s" \
+		tmpdir/weak-fundef.o]} then {
+    fail $testname
+} elseif {![ld_simple_link $ld tmpdir/weak-fundef.so \
+	    "--shared tmpdir/weak-fundef.o"]} then {
     fail $testname
+} elseif {![is_remote host] && [which $nm] == 0} then {
+    unresolved $testname
 } else {
-    if {![is_remote host] && [which $objdump] == 0} then {
-	unresolved $testname
-	return
-    }
-
-    set exec_output [run_host_cmd "$objdump" "-s tmpdir/weak-undef"]
+    set exec_output [run_host_cmd "$nm" "-D tmpdir/weak-fundef.so"]
     set exec_output [prune_warnings $exec_output]
     verbose -log $exec_output
 
+    set output_regexp ".*w undef_weak_fun.*"
+
     if {[regexp $output_regexp $exec_output]} then {
 	pass $testname
     } else {
 	fail $testname
     }
+
+    # When linking a dynamic executable, weak undefined symbols become dynamic.
+    set testname "weak undefined function symbols in dynamic exe"
+
+    if {![ld_simple_link $ld tmpdir/weak-fundef \
+	  "--no-as-needed tmpdir/weak-fundef.o tmpdir/weak-fundef.so"]} then {
+	fail $testname
+    } else {
+	set exec_output [run_host_cmd "$nm" "-D tmpdir/weak-fundef"]
+	set exec_output [prune_warnings $exec_output]
+	verbose -log $exec_output
+
+	if {[regexp $output_regexp $exec_output]} then {
+	    pass $testname
+	} else {
+	    fail $testname
+	}
+    }
 }
diff --git a/ld/testsuite/ld-undefined/weak-undef.t b/ld/testsuite/ld-undefined/weak-undef.t
index a95bbcf1e3a..c0e84092699 100644
--- a/ld/testsuite/ld-undefined/weak-undef.t
+++ b/ld/testsuite/ld-undefined/weak-undef.t
@@ -1,7 +1,7 @@
 SECTIONS
 {
   .data : {
-    tmpdir/weak-undef.o(.data)
+    *(.data)
   }
   /DISCARD/ : {
     *(*)