weak alias test

This adds the test I was using when testing 60d67dc8.

	* testsuite/ld-elfweak/alias.c,
	* testsuite/ld-elfweak/alias.dat,
	* testsuite/ld-elfweak/aliasmain.c,
	* testsuite/ld-elfweak/weakref1.c,
	* testsuite/ld-elfweak/weakref2.c: New test.
	* testsuite/ld-elfweak/elfweak.exp: Run it.  Don't return on fails,
	attempt other tests.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0729d2167ab41df5eef8d3326ccb19cb028dd351..e0873827ba98fb33d2a9304b13746591d79a94db 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2017-12-01  Alan Modra  <amodra@gmail.com>
+
+       * testsuite/ld-elfweak/alias.c,
+       * testsuite/ld-elfweak/alias.dat,
+       * testsuite/ld-elfweak/aliasmain.c,
+       * testsuite/ld-elfweak/weakref1.c,
+       * testsuite/ld-elfweak/weakref2.c: New test.
+       * testsuite/ld-elfweak/elfweak.exp: Run it.  Don't return on fails,
+       attempt other tests.
+
 2017-12-01  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-elf/shared.exp: Run new textrel tests.

diff --git a/ld/testsuite/ld-elfweak/alias.c b/ld/testsuite/ld-elfweak/alias.c
new file mode 100644 (file)
index 0000000..93de464
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/alias.c
@@ -0,0 +1,3 @@
+int strongsym = 123;
+extern int __attribute__ ((weak, alias ("strongsym"))) weaksym1;
+extern int __attribute__ ((weak, alias ("strongsym"))) weaksym2;

diff --git a/ld/testsuite/ld-elfweak/alias.dat b/ld/testsuite/ld-elfweak/alias.dat
new file mode 100644 (file)
index 0000000..802374f
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/alias.dat
@@ -0,0 +1 @@
+value via psym1: 123, via psym2: 123, strong 123

diff --git a/ld/testsuite/ld-elfweak/aliasmain.c b/ld/testsuite/ld-elfweak/aliasmain.c
new file mode 100644 (file)
index 0000000..524a047
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/aliasmain.c
@@ -0,0 +1,12 @@
+#include <stdio.h>
+
+extern int *psym1, *psym2;
+extern int strongsym;
+
+int
+main (void)
+{
+  printf ("value via psym1: %d, via psym2: %d, strong %d\n",
+         *psym1, *psym2, strongsym);
+  return 0;
+}

diff --git a/ld/testsuite/ld-elfweak/elfweak.exp b/ld/testsuite/ld-elfweak/elfweak.exp
index 49b6c565349be32468f8a91b1cd60001d9bcb3a5..1826fef7f6c0983db4b2476c32c473d99c9cb6f3 100644 (file)
--- a/ld/testsuite/ld-elfweak/elfweak.exp
+++ b/ld/testsuite/ld-elfweak/elfweak.exp
@@ -393,121 +393,66 @@ if { [istarget mips*-*-*] && ! [at_least_gcc_version 4 3] } then {
 }
 verbose "Using $picflag to compile PIC code"
 
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo.c $tmpdir/foo.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar.c $tmpdir/bar.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/main.c $tmpdir/main.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if {![ld_link $CC $tmpdir/libbar.so "$shared $tmpdir/bar.o"]} {
-    fail "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo1a.c $tmpdir/foo1a.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo1b.c $tmpdir/foo1b.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1a.c $tmpdir/bar1a.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1b.c $tmpdir/bar1b.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1c.c $tmpdir/bar1c.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/main1.c $tmpdir/main1.o] {
-    unresolved "ELF weak"
-    return
-}
-
-if {![ld_link $CC $tmpdir/libfoo1a.so "$shared $tmpdir/foo1a.o"]} {
+if {![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo.c $tmpdir/foo.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar.c $tmpdir/bar.o]
+    || ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/main.c $tmpdir/main.o]
+    || ![ld_link $CC $tmpdir/libbar.so "$shared $tmpdir/bar.o"]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo1a.c $tmpdir/foo1a.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/foo1b.c $tmpdir/foo1b.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1a.c $tmpdir/bar1a.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1b.c $tmpdir/bar1b.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/bar1c.c $tmpdir/bar1c.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/main1.c $tmpdir/main1.o]
+    || ![ld_link $CC $tmpdir/libfoo1a.so "$shared $tmpdir/foo1a.o"]
+    || ![ld_link $CC $tmpdir/libfoo1b.so "$shared $tmpdir/foo1b.o"]
+    || ![ld_link $CC $tmpdir/libbar1a.so "$shared $tmpdir/bar1a.o $tmpdir/libfoo1a.so"]} then {
     fail "ELF weak"
-    return
-}
-
-if {![ld_link $CC $tmpdir/libfoo1b.so "$shared $tmpdir/foo1b.o"]} {
-    fail "ELF weak"
-    return
-}
-
-if {![ld_link $CC $tmpdir/libbar1a.so "$shared $tmpdir/bar1a.o $tmpdir/libfoo1a.so"]} {
-    fail "ELF weak"
-    return
-}
-
-build_lib "ELF DSO weak func first" libfoo "foo.o bar.o" dso.dsym
-build_lib "ELF DSO weak func last" libfoo "bar.o foo.o" dso.dsym
-build_lib "ELF DSO weak func first DSO" libfoo "foo.o libbar.so" dsow.dsym
-build_lib "ELF DSO weak func last DSO" libfoo "libbar.so foo.o" dsow.dsym
-build_exec "ELF weak func first" foo "main.o bar.o" "" strong "" strong.sym
-build_exec "ELF weak func last" foo "bar.o main.o" "" strong "" strong.sym
-build_exec "ELF weak func first DSO" foo "main.o libbar.so" "-Wl,-rpath,.,--no-as-needed" weak weak.dsym ""
-build_exec "ELF weak func last DSO" foo "libbar.so main.o" "-Wl,-rpath,.,--no-as-needed" weak weak.dsym ""
-
-build_lib "ELF DSO weak data first" libfoo "bar1a.o foo1a.o" dsodata.dsym
-build_lib "ELF DSO weak data last" libfoo "foo1a.o bar1a.o" dsodata.dsym
-build_lib "ELF DSO weak data first DSO" libfoo "main1.o libfoo1a.so" dsowdata.dsym
-build_lib "ELF DSO weak data last DSO" libfoo "libfoo1a.so main1.o" dsowdata.dsym
-build_lib "ELF DSO weak data first DSO common" libfoo "main1.o libfoo1b.so" dsowdata.dsym
-build_lib "ELF DSO weak data last DSO common" libfoo "libfoo1b.so main1.o" dsowdata.dsym
-build_exec "ELF weak data first" foo "main1.o bar1a.o foo1a.o" "" strongdata "" strongdata.sym
-build_exec "ELF weak data last" foo "foo1a.o main1.o bar1a.o" "" strongdata "" strongdata.sym
-build_exec "ELF weak data first common" foo "main1.o bar1a.o foo1b.o" "" strongdata "" strongcomm.sym
-build_exec "ELF weak data last common" foo "foo1b.o main1.o bar1a.o" "" strongdata "" strongcomm.sym
-build_exec "ELF weak data first DSO" foo "main1.o libbar1a.so libfoo1a.so" "-Wl,-rpath,.,--no-as-needed" weakdata weakdata.dsym ""
-build_exec "ELF weak data last DSO" foo "libfoo1a.so main1.o libbar1a.so" "-Wl,-rpath,.,--no-as-needed" weakdata weakdata.dsym ""
-build_exec "ELF weak data first DSO common" foo "main1.o libbar1a.so libfoo1b.so" "-Wl,--no-as-needed,-rpath,.,-rpath-link,." weakdata weakdata.dsym ""
-build_exec "ELF weak data last DSO common" foo "libfoo1b.so main1.o libbar1a.so" "-Wl,--no-as-needed,-rpath,.,-rpath-link,." weakdata weakdata.dsym ""
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/size_foo.c $tmpdir/size_foo.o] {
-    unresolved "ELF weak (size)"
-    return
-}
-
-if ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/size_bar.c $tmpdir/size_bar.o] {
-    unresolved "ELF weak (size)"
-    return
+} else {
+    build_lib "ELF DSO weak func first" libfoo "foo.o bar.o" dso.dsym
+    build_lib "ELF DSO weak func last" libfoo "bar.o foo.o" dso.dsym
+    build_lib "ELF DSO weak func first DSO" libfoo "foo.o libbar.so" dsow.dsym
+    build_lib "ELF DSO weak func last DSO" libfoo "libbar.so foo.o" dsow.dsym
+    build_exec "ELF weak func first" foo "main.o bar.o" "" strong "" strong.sym
+    build_exec "ELF weak func last" foo "bar.o main.o" "" strong "" strong.sym
+    build_exec "ELF weak func first DSO" foo "main.o libbar.so" "-Wl,-rpath,.,--no-as-needed" weak weak.dsym ""
+    build_exec "ELF weak func last DSO" foo "libbar.so main.o" "-Wl,-rpath,.,--no-as-needed" weak weak.dsym ""
+    build_lib "ELF DSO weak data first" libfoo "bar1a.o foo1a.o" dsodata.dsym
+    build_lib "ELF DSO weak data last" libfoo "foo1a.o bar1a.o" dsodata.dsym
+    build_lib "ELF DSO weak data first DSO" libfoo "main1.o libfoo1a.so" dsowdata.dsym
+    build_lib "ELF DSO weak data last DSO" libfoo "libfoo1a.so main1.o" dsowdata.dsym
+    build_lib "ELF DSO weak data first DSO common" libfoo "main1.o libfoo1b.so" dsowdata.dsym
+    build_lib "ELF DSO weak data last DSO common" libfoo "libfoo1b.so main1.o" dsowdata.dsym
+    build_exec "ELF weak data first" foo "main1.o bar1a.o foo1a.o" "" strongdata "" strongdata.sym
+    build_exec "ELF weak data last" foo "foo1a.o main1.o bar1a.o" "" strongdata "" strongdata.sym
+    build_exec "ELF weak data first common" foo "main1.o bar1a.o foo1b.o" "" strongdata "" strongcomm.sym
+    build_exec "ELF weak data last common" foo "foo1b.o main1.o bar1a.o" "" strongdata "" strongcomm.sym
+    build_exec "ELF weak data first DSO" foo "main1.o libbar1a.so libfoo1a.so" "-Wl,-rpath,.,--no-as-needed" weakdata weakdata.dsym ""
+    build_exec "ELF weak data last DSO" foo "libfoo1a.so main1.o libbar1a.so" "-Wl,-rpath,.,--no-as-needed" weakdata weakdata.dsym ""
+    build_exec "ELF weak data first DSO common" foo "main1.o libbar1a.so libfoo1b.so" "-Wl,--no-as-needed,-rpath,.,-rpath-link,." weakdata weakdata.dsym ""
+    build_exec "ELF weak data last DSO common" foo "libfoo1b.so main1.o libbar1a.so" "-Wl,--no-as-needed,-rpath,.,-rpath-link,." weakdata weakdata.dsym ""
 }
 
-build_lib "ELF DSO small bar (size)" libsize_bar "size_bar.o" ""
-build_lib "ELF DSO foo with small bar (size)" libsize_foo "size_foo.o libsize_bar.so" ""
-
-if ![ld_compile "$CC $CFLAGS $picflag -DSIZE_BIG" $srcdir/$subdir/size_bar.c $tmpdir/size_bar.o] {
+if {![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/size_foo.c $tmpdir/size_foo.o]
+    || ![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/size_bar.c $tmpdir/size_bar_s.o]
+    || ![ld_compile "$CC $CFLAGS $picflag -DSIZE_BIG" $srcdir/$subdir/size_bar.c $tmpdir/size_bar.o]
+    || ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/size_main.c $tmpdir/size_main.o]} then {
     unresolved "ELF weak (size)"
-    return
-}
-
-build_lib "ELF DSO big bar (size)" libsize_bar "size_bar.o" ""
-
-if ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/size_main.c $tmpdir/size_main.o] {
-    unresolved "ELF weak (size)"
-    return
+} else {
+    build_lib "ELF DSO small bar (size)" libsize_bar_s "size_bar_s.o" ""
+    build_lib "ELF DSO foo with small bar (size)" libsize_foo "size_foo.o libsize_bar_s.so" ""
+    build_lib "ELF DSO big bar (size)" libsize_bar "size_bar.o" ""
+    build_exec "ELF weak size" size_main "size_main.o libsize_foo.so libsize_bar.so" "-Wl,-rpath=.,-rpath-link=.,--no-as-needed" size "" ""
 }
 
-build_exec "ELF weak size" size_main "size_main.o libsize_foo.so libsize_bar.so" "-Wl,-rpath,.,--no-as-needed" size "" ""
-
 verbose "size2"
 run_dump_test $srcdir/$subdir/size2
+
+if {![ld_compile "$CC $CFLAGS $picflag" $srcdir/$subdir/alias.c $tmpdir/alias.o]
+    || ![ld_link $CC $tmpdir/alias.so "$shared $tmpdir/alias.o"]
+    || ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/aliasmain.c $tmpdir/aliasmain.o]
+    || ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/weakref1.c $tmpdir/weakref1.o]
+    || ![ld_compile "$CC $CFLAGS" $srcdir/$subdir/weakref2.c $tmpdir/weakref2.o]} then {
+    unresolved "ELF weak (alias)"
+} else {
+    build_exec "ELF weak (alias)" alias "aliasmain.o weakref1.o weakref2.o alias.so" "-Wl,-rpath=.,--no-as-needed" alias "" ""
+}

diff --git a/ld/testsuite/ld-elfweak/weakref1.c b/ld/testsuite/ld-elfweak/weakref1.c
new file mode 100644 (file)
index 0000000..26b962c
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/weakref1.c
@@ -0,0 +1,2 @@
+extern int weaksym1;
+int *psym1 = &weaksym1;

diff --git a/ld/testsuite/ld-elfweak/weakref2.c b/ld/testsuite/ld-elfweak/weakref2.c
new file mode 100644 (file)
index 0000000..b70107e
--- /dev/null
+++ b/ld/testsuite/ld-elfweak/weakref2.c
@@ -0,0 +1,2 @@
+extern int weaksym2;
+int *psym2 __attribute__ ((section (".data1"))) = &weaksym2;