* 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.

8 files changed, 188 insertions, 0 deletions

diff --git a/ld/testsuite/ld-elf/export-class-def.s b/ld/testsuite/ld-elf/export-class-def.s
new file mode 100644
index 0000000..90f908f
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class-def.s
@@ -0,0 +1,25 @@
+	.data
+	.balign		32
+	.xdef		protected_bar
+	.protected	protected_bar
+protected_bar:
+	.balign		32
+	.xdef		protected_foo
+	.protected	protected_foo
+protected_foo:
+	.balign		32
+	.xdef		hidden_bar
+	.hidden		hidden_bar
+hidden_bar:
+	.balign		32
+	.xdef		hidden_foo
+	.hidden		hidden_foo
+hidden_foo:
+	.balign		32
+	.xdef		internal_bar
+	.internal	internal_bar
+internal_bar:
+	.balign		32
+	.xdef		internal_foo
+	.internal	internal_foo
+internal_foo:
diff --git a/ld/testsuite/ld-elf/export-class-dep.s b/ld/testsuite/ld-elf/export-class-dep.s
new file mode 100644
index 0000000..e987898
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class-dep.s
@@ -0,0 +1,25 @@
+	.data
+	.balign		16
+	.dc.a		protected_foo
+	.balign		16
+	.dc.a		protected_bar
+	.balign		16
+	.dc.a		hidden_foo
+	.balign		16
+	.dc.a		hidden_bar
+	.balign		16
+	.dc.a		internal_foo
+	.balign		16
+	.dc.a		internal_bar
+	.balign		32
+	.xdef		protected_baz
+	.protected	protected_baz
+protected_baz:
+	.balign		32
+	.xdef		hidden_baz
+	.hidden		hidden_baz
+hidden_baz:
+	.balign		32
+	.xdef		internal_baz
+	.internal	internal_baz
+internal_baz:
diff --git a/ld/testsuite/ld-elf/export-class-lib.s b/ld/testsuite/ld-elf/export-class-lib.s
new file mode 100644
index 0000000..b3f3f05
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class-lib.s
@@ -0,0 +1,10 @@
+	.data
+	.balign		16
+	.xdef		protected_foo
+protected_foo:
+	.balign		16
+	.xdef		hidden_foo
+hidden_foo:
+	.balign		16
+	.xdef		internal_foo
+internal_foo:
diff --git a/ld/testsuite/ld-elf/export-class-lib.ver b/ld/testsuite/ld-elf/export-class-lib.ver
new file mode 100644
index 0000000..a9dbfdc
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class-lib.ver
@@ -0,0 +1 @@
+GCC_3.0 { global: *_foo; };
diff --git a/ld/testsuite/ld-elf/export-class-ref.s b/ld/testsuite/ld-elf/export-class-ref.s
new file mode 100644
index 0000000..4e45c02
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class-ref.s
@@ -0,0 +1,7 @@
+	.data
+	.balign		16
+	.dc.a		protected_baz
+	.balign		16
+	.dc.a		hidden_baz
+	.balign		16
+	.dc.a		internal_baz
diff --git a/ld/testsuite/ld-elf/export-class.exp b/ld/testsuite/ld-elf/export-class.exp
new file mode 100644
index 0000000..81ce55a
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class.exp
@@ -0,0 +1,87 @@
+# Expect script for symbol export classes.
+#
+# 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-ELF targets.
+if { ![is_elf_format] } {
+    return
+}
+
+# Exclude some more targets; feel free to include your favorite one
+# if you like.
+if { ![istarget *-*-linux*]
+     && ![istarget *-*-nacl*]
+     && ![istarget *-*-gnu*] } {
+    return
+}
+
+set testname "Symbol export class test"
+
+# Build an auxiliary shared object with conflicting versioned symbol
+# definitions.
+run_ld_link_tests [list \
+    [list \
+	"$testname (auxiliary shared object)" \
+	"-shared -version-script export-class-lib.ver" \
+	"" \
+	{ export-class-lib.s } \
+	{} \
+	"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)" \
+	"-r" \
+	"" \
+	{ export-class-ref.s } \
+	{} \
+	"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)" \
+	"-shared -Tdata=0x12340000 tmpdir/export-class-ref-r.o tmpdir/export-class-lib.so" \
+	"" \
+	{ export-class-dep.s export-class-def.s } \
+	{ \
+	    { readelf -s export-class.sd } \
+	    { readelf -V export-class.vd } \
+	} \
+	"export-class.so" \
+    ] \
+]
diff --git a/ld/testsuite/ld-elf/export-class.sd b/ld/testsuite/ld-elf/export-class.sd
new file mode 100644
index 0000000..bd5c549
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class.sd
@@ -0,0 +1,32 @@
+Symbol table '\.dynsym' contains [0-9]+ entries:
+ * Num: * Value * Size * Type * Bind * Vis * Ndx * Name
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_foo
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_bar
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_baz
+#...
+Symbol table '\.symtab' contains [0-9]+ entries:
+ * Num: * Value * Size * Type * Bind * Vis * Ndx * Name
+#...
+ * [0-9a-f]+: * 0*12340000 * 0 * SECTION * LOCAL * DEFAULT * [0-9]+ *
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * hidden_foo
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * internal_baz
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * internal_bar
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * internal_foo
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * hidden_bar
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * LOCAL * DEFAULT * [0-9]+ * hidden_baz
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_foo
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_bar
+#...
+ * [0-9a-f]+: * 0*123400a0 * 0 * NOTYPE * GLOBAL * PROTECTED * [0-9]+ * protected_baz
+#pass
diff --git a/ld/testsuite/ld-elf/export-class.vd b/ld/testsuite/ld-elf/export-class.vd
new file mode 100644
index 0000000..1a87494
--- /dev/null
+++ b/ld/testsuite/ld-elf/export-class.vd
@@ -0,0 +1 @@
+No version information found in this file\.