Riscv shared libraries should not export __global_pointer$.

	ld/
	* emulparams/elf32lriscv-defs.sh (SDATA_START_SYMBOLS): Mark
	__global_pointer$ as HIDDEN.
	* testsuite/ld-riscv-elf/gp-hidden-64.rd: New.
	* testsuite/ld-riscv-elf/gp-hidden-lib.rd: New.
	* testsuite/ld-riscv-elf/gp-hidden-lib.s: New.
	* testsuite/ld-riscv-elf/gp-hidden-ver-64.rd: New.
	* testsuite/ld-riscv-elf/gp-hidden-ver.rd: New.
	* testsuite/ld-riscv-elf/gp-hidden-ver.s: New.
	* testsuite/ld-riscv-elf/gp-hidder-ver.ver: New.
	* testsuite/ld-riscv-elf/gp-hidden.rd: New.
	* testsuite/ld-riscv-elf/gp-hidden.s: New.
	* testsuite/ld-riscv-elf/gp-hidden.sd: New.
	* testsuite/ld-riscv-elf/ld-riscv-elf.exp: Change riscv to riscv*.
	Run the new tests with run_ld_link_tests.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6b0e026b5824bc78f3daf746d06418c9856bd5e4..69384d839b21587db82a642e20698a2a05ce8e59 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,20 @@
+2017-12-04  Jim Wilson  <jimw@sifive.com>
+
+       * emulparams/elf32lriscv-defs.sh (SDATA_START_SYMBOLS): Mark
+       __global_pointer$ as HIDDEN.
+       * testsuite/ld-riscv-elf/gp-hidden-64.rd: New.
+       * testsuite/ld-riscv-elf/gp-hidden-lib.rd: New.
+       * testsuite/ld-riscv-elf/gp-hidden-lib.s: New.
+       * testsuite/ld-riscv-elf/gp-hidden-ver-64.rd: New.
+       * testsuite/ld-riscv-elf/gp-hidden-ver.rd: New.
+       * testsuite/ld-riscv-elf/gp-hidden-ver.s: New.
+       * testsuite/ld-riscv-elf/gp-hidder-ver.ver: New.
+       * testsuite/ld-riscv-elf/gp-hidden.rd: New.
+       * testsuite/ld-riscv-elf/gp-hidden.s: New.
+       * testsuite/ld-riscv-elf/gp-hidden.sd: New.
+       * testsuite/ld-riscv-elf/ld-riscv-elf.exp: Change riscv to riscv*.
+       Run the new tests with run_ld_link_tests.
+
 2017-12-04  Alan Modra  <amodra@gmail.com>
 
        * testsuite/ld-i386/pr17935-1.d: Adjust expected error.

diff --git a/ld/emulparams/elf32lriscv-defs.sh b/ld/emulparams/elf32lriscv-defs.sh
index ab803332898b1e4559fe48b7c5fe59dcfcbe458e..5b41d5cd0290b98ece083d54ca9c09e4258aedbd 100644 (file)
--- a/ld/emulparams/elf32lriscv-defs.sh
+++ b/ld/emulparams/elf32lriscv-defs.sh
@@ -23,7 +23,7 @@ TEXT_START_ADDR=0x10000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
 COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 
-SDATA_START_SYMBOLS="__global_pointer$ = . + 0x800;
+SDATA_START_SYMBOLS="HIDDEN (__global_pointer$ = . + 0x800);
     *(.srodata.cst16) *(.srodata.cst8) *(.srodata.cst4) *(.srodata.cst2) *(.srodata .srodata.*)"
 
 INITIAL_READONLY_SECTIONS=".interp         : { *(.interp) } ${CREATE_PIE-${INITIAL_READONLY_SECTIONS}}"

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-64.rd b/ld/testsuite/ld-riscv-elf/gp-hidden-64.rd
new file mode 100644 (file)
index 0000000..aaaec93
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-64.rd
@@ -0,0 +1,4 @@
+
+Relocation section '\.rela\.dyn' at offset .* contains 1 entry:
+ *Offset * Info * Type * Sym\. *Value * Sym\. *Name \+ Addend
+[0-9a-f]+ * [0-9a-f]+02 * R_RISCV_64 * [0-9a-f]+ * foo \+ 0

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-lib.rd b/ld/testsuite/ld-riscv-elf/gp-hidden-lib.rd
new file mode 100644 (file)
index 0000000..59b4442
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-lib.rd
@@ -0,0 +1,5 @@
+
+Relocation section '\.rela\.dyn' at offset .* contains 1 entry:
+ *Offset * Info * Type * Sym\. *Value * Sym\. *Name \+ Addend
+# This must be an absolute relocation, there must not be a _gp reference.
+[0-9a-f]+ * 0+03 * R_RISCV_RELATIVE * [0-9a-f]+

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-lib.s b/ld/testsuite/ld-riscv-elf/gp-hidden-lib.s
new file mode 100644 (file)
index 0000000..04f0655
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-lib.s
@@ -0,0 +1,6 @@
+       .data
+       .globl  bar
+       .type   bar, @object
+bar:
+       .dc.a   __global_pointer$
+       .size   bar, . - bar

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-ver-64.rd b/ld/testsuite/ld-riscv-elf/gp-hidden-ver-64.rd
new file mode 100644 (file)
index 0000000..57cb13f
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-ver-64.rd
@@ -0,0 +1,6 @@
+
+Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
+ *Offset * Info * Type * Sym\. *Value * Sym\. *Name \+ Addend
+# This must be an absolute relocation, there must not be a _gp reference.
+[0-9a-f]+ * 0+03 * R_RISCV_RELATIVE * [0-9a-f]+
+[0-9a-f]+ * [0-9a-f]+02 * R_RISCV_64 * [0-9a-f]+ * bar \+ 0

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-ver.rd b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.rd
new file mode 100644 (file)
index 0000000..dbed24f
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.rd
@@ -0,0 +1,6 @@
+
+Relocation section '\.rela\.dyn' at offset .* contains 2 entries:
+ *Offset * Info * Type * Sym\. *Value * Sym\. *Name \+ Addend
+# This must be an absolute relocation, there must not be a _gp reference.
+[0-9a-f]+ * 0+03 * R_RISCV_RELATIVE * [0-9a-f]+
+[0-9a-f]+ * [0-9a-f]+01 * R_RISCV_32 * [0-9a-f]+ * bar \+ 0

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-ver.s b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.s
new file mode 100644 (file)
index 0000000..a197bac
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.s
@@ -0,0 +1,7 @@
+       .data
+       .globl  foo
+       .type   foo, @object
+foo:
+       .dc.a   bar
+       .dc.a   __global_pointer$
+       .size   foo, . - foo

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden-ver.ver b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.ver
new file mode 100644 (file)
index 0000000..b6b2365
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden-ver.ver
@@ -0,0 +1 @@
+{ global: foo; local: *; };

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden.rd b/ld/testsuite/ld-riscv-elf/gp-hidden.rd
new file mode 100644 (file)
index 0000000..dc29f7d
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden.rd
@@ -0,0 +1,4 @@
+
+Relocation section '\.rela\.dyn' at offset .* contains 1 entry:
+ *Offset * Info * Type * Sym\. *Value * Sym\. *Name \+ Addend
+[0-9a-f]+ * [0-9a-f]+01 * R_RISCV_32 * [0-9a-f]+ * foo \+ 0

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden.s b/ld/testsuite/ld-riscv-elf/gp-hidden.s
new file mode 100644 (file)
index 0000000..18d3ca3
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden.s
@@ -0,0 +1,7 @@
+       .data
+       .globl  blah
+       .type   blah, @object
+blah:
+       .dc.a   foo
+       .dc.a   __global_pointer$
+       .size   blah, . - blah

diff --git a/ld/testsuite/ld-riscv-elf/gp-hidden.sd b/ld/testsuite/ld-riscv-elf/gp-hidden.sd
new file mode 100644 (file)
index 0000000..f4321c2
--- /dev/null
+++ b/ld/testsuite/ld-riscv-elf/gp-hidden.sd
@@ -0,0 +1,9 @@
+
+Symbol table '.dynsym' contains [0-9]+ entries:
+ * Num: * Value * Size * Type * Bind * Vis * Ndx * Name
+#...
+Symbol table '.symtab' contains [0-9]+ entries:
+ * Num: * Value * Size * Type * Bind * Vis * Ndx * Name
+#...
+ * [0-9a-f]+: * [0-9a-f]+ * 0 * NOTYPE * LOCAL * DEFAULT .* __global_pointer\$
+#pass

diff --git a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
index c219b181590eab8562696d1a59debd73c0f11d2c..9f5959cc3be3a3c40726f564093507738618ad90 100644 (file)
--- a/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
+++ b/ld/testsuite/ld-riscv-elf/ld-riscv-elf.exp
@@ -19,6 +19,38 @@
 # MA 02110-1301, USA.
 #
 
-if [istarget "riscv-*-*"] {
+if [istarget "riscv*-*-*"] {
     run_dump_test "c-lui"
+
+    set abis { rv32gc ilp32 elf32lriscv rv64gc lp64 elf64lriscv }
+    foreach { arch abi emul } $abis {
+       # This checks whether our linker scripts get the scope of
+       # __global_pointer$ right, and thus must therefore use default scripts.
+       set suff64 [string map {ilp32 "" lp64 -64} $abi]
+       run_ld_link_tests [list \
+                              [list "gp scope test ($abi shared library)" \
+                                   "-m$emul -shared" "" \
+                                   "-march=$arch -mabi=$abi -fpic" \
+                                   { gp-hidden-lib.s } \
+                                   [list \
+                                        "readelf --relocs gp-hidden-lib.rd" \
+                                        "readelf --syms gp-hidden.sd"] \
+                                   "gp-hidden-lib-${abi}.so"] \
+                              [list "gp scope test ($abi versioned lib)" \
+                                   "-m$emul -shared -version-script gp-hidden-ver.ver tmpdir/gp-hidden-lib-${abi}.so" "" \
+                                   "-march=$arch -mabi=$abi -fpic" \
+                                   { gp-hidden-ver.s } \
+                                   [list \
+                                        "readelf --relocs gp-hidden-ver${suff64}.rd" \
+                                        "readelf --syms gp-hidden.sd"] \
+                                   "gp-hidden-ver-${abi}.so"] \
+                              [list "gp scope test ($abi executable)" \
+                                   "-m$emul -e 0 -rpath-link . tmpdir/gp-hidden-ver-${abi}.so" "" \
+                                   "-march=$arch -mabi=$abi" \
+                                   {gp-hidden.s} \
+                                   [list \
+                                        "readelf --relocs gp-hidden${suff64}.rd" \
+                                        "readelf --syms gp-hidden.sd"]\
+                                   "gp-hidden-${abi}"]]
+    }
 }