* ld-elf/export-class.sd: New test.

	* ld-elf/export-class.vd: New test.
	* ld-elf/export-class-def.s: New test source.
	* ld-elf/export-class-dep.s: New test source.
	* ld-elf/export-class-lib.s: New test source.
	* ld-elf/export-class-ref.s: New test source.
	* ld-elf/export-class-lib.ver: New test version script.
	* ld-elf/export-class.exp: New test script.
	* ld-arm/arm-export-class.rd: New test.
	* ld-arm/arm-export-class.xd: New test.
	* ld-arm/export-class.exp: New test script.
	* ld-i386/i386-export-class.rd: New test.
	* ld-i386/i386-export-class.xd: New test.
	* ld-i386/export-class.exp: New test script.
	* ld-mips-elf/mips-32-export-class.rd: New test.
	* ld-mips-elf/mips-32-export-class.xd: New test.
	* ld-mips-elf/mips-64-export-class.rd: New test.
	* ld-mips-elf/mips-64-export-class.xd: New test.
	* ld-mips-elf/export-class.exp: New test script.
	* ld-powerpc/powerpc-32-export-class.rd: New test.
	* ld-powerpc/powerpc-32-export-class.xd: New test.
	* ld-powerpc/powerpc-64-export-class.rd: New test.
	* ld-powerpc/powerpc-64-export-class.xd: New test.
	* ld-powerpc/export-class.exp: New test script.
	* ld-x86-64/x86-64-64-export-class.rd: New test.
	* ld-x86-64/x86-64-x32-export-class.rd: New test.
	* ld-x86-64/export-class.exp: New test script.

3 files changed, 115 insertions, 0 deletions

diff --git a/ld/testsuite/ld-x86-64/export-class.exp b/ld/testsuite/ld-x86-64/export-class.exp
new file mode 100644
index 0000000..af75b77
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/export-class.exp
@@ -0,0 +1,93 @@
+# Expect script for symbol export classes, x86-64 variation.
+#
+# Copyright 2012 Free Software Foundation, Inc.
+#
+# This file is part of the GNU Binutils.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
+#
+
+#
+# Written by Maciej W. Rozycki <macro@codesourcery.com>
+#
+
+# Exclude non-Linux targets; feel free to include your favorite one
+# if you like.
+if { ![istarget x86_64*-*-linux*] } {
+    return
+}
+
+proc x86_64_export_class_test { abi flag emul } {
+
+    set testname "x86-64 $abi symbol export class test"
+
+    set dump [string map {32 ../ld-i386/i386 x32 x86-64-x32 64 x86-64-64} $abi]
+
+    set AFLAGS "$flag"
+    set LDFLAGS "-m$emul"
+
+    # Build an auxiliary shared object with conflicting versioned symbol
+    # definitions.
+    run_ld_link_tests [list \
+	[list \
+	    "$testname (auxiliary shared object)" \
+	    "$LDFLAGS -shared -version-script ../ld-elf/export-class-lib.ver" \
+	    "$AFLAGS" \
+	    { ../ld-elf/export-class-lib.s } \
+	    {} \
+	    "x86-64-$abi-export-class-lib.so" \
+	] \
+    ]
+
+    # Build a static object that pulls symbol definitions.  It has to come
+    # first before the auxiliary shared object and other static objects on
+    # the linker's command line and hence we need to build it separately.
+    run_ld_link_tests [list \
+	[list \
+	    "$testname (initial static object)" \
+	    "$LDFLAGS -r" \
+	    "$AFLAGS" \
+	    { ../ld-elf/export-class-ref.s } \
+	    {} \
+	    "x86-64-$abi-export-class-ref-r.o" \
+	] \
+    ]
+
+    # Build static objects that satisfy symbol dependencies and preempt
+    # shared-object symbol definitions, and link all the objects built into
+    # the final shared object.  The command-line order of objects linked is
+    # important to make sure the linker correctly preempts versioned symbols
+    # from the auxiliary shared object and is as follows: ref, lib, dep, def.
+    # Get a dump to make sure symbol dependencies are resolved internally.
+    run_ld_link_tests [list \
+	[list \
+	    "$testname (final shared object)" \
+	    "$LDFLAGS -shared -Tdata=0x12340000 tmpdir/x86-64-$abi-export-class-ref-r.o tmpdir/x86-64-$abi-export-class-lib.so" \
+	    "$AFLAGS" \
+	    { ../ld-elf/export-class-dep.s ../ld-elf/export-class-def.s } \
+	    [list \
+		[list readelf -r $dump-export-class.rd] \
+		[list readelf "-x .data" ../ld-i386/i386-export-class.xd] \
+	    ] \
+	    "x86-64-$abi-export-class.so" \
+	] \
+    ]
+}
+
+set abis { 32 --32 elf_i386 x32 --x32 elf32_x86_64 64 --64 elf_x86_64 }
+foreach { abi flag emul } $abis {
+    x86_64_export_class_test $abi $flag $emul
+}
diff --git a/ld/testsuite/ld-x86-64/x86-64-64-export-class.rd b/ld/testsuite/ld-x86-64/x86-64-64-export-class.rd
new file mode 100644
index 0000000..308e307
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/x86-64-64-export-class.rd
@@ -0,0 +1,11 @@
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ * Offset * Info * Type * Sym\. *Value * Sym\. * Name * \+ * Addend
+000012340010  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340020  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340060  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340070  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340080  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340090  000000000008 R_X86_64_RELATIVE                    123400a0
+000012340000  [0-9a-f]+00000001 R_X86_64_64       00000000123400a0 protected_baz \+ 0
+000012340040  [0-9a-f]+00000001 R_X86_64_64       00000000123400a0 protected_foo \+ 0
+000012340050  [0-9a-f]+00000001 R_X86_64_64       00000000123400a0 protected_bar \+ 0
diff --git a/ld/testsuite/ld-x86-64/x86-64-x32-export-class.rd b/ld/testsuite/ld-x86-64/x86-64-x32-export-class.rd
new file mode 100644
index 0000000..4ea93ba
--- /dev/null
+++ b/ld/testsuite/ld-x86-64/x86-64-x32-export-class.rd
@@ -0,0 +1,11 @@
+Relocation section '\.rela\.dyn' at offset 0x[0-9a-f]+ contains [0-9]+ entries:
+ * Offset * Info * Type * Sym\. *Value * Sym\. * Name * \+ * Addend
+12340010  00000008 R_X86_64_RELATIVE            123400a0
+12340020  00000008 R_X86_64_RELATIVE            123400a0
+12340060  00000008 R_X86_64_RELATIVE            123400a0
+12340070  00000008 R_X86_64_RELATIVE            123400a0
+12340080  00000008 R_X86_64_RELATIVE            123400a0
+12340090  00000008 R_X86_64_RELATIVE            123400a0
+12340000  [0-9a-f]+0a R_X86_64_32       123400a0   protected_baz \+ 0
+12340040  [0-9a-f]+0a R_X86_64_32       123400a0   protected_foo \+ 0
+12340050  [0-9a-f]+0a R_X86_64_32       123400a0   protected_bar \+ 0