[2/2] MIPS/LD: Reject tprel_hi and tprel_lo relocations in shared library

Message ID 20190518081905.223364-3-fshahbazker@wavecomp.com
State New
Headers show
Series
  • MIPS/LD: Improve error checking for relocations in shared libraries
Related show

Commit Message

Faraz Shahbazker May 18, 2019, 8:19 a.m.
bfd/
	* elfxx-mips.c (_bfd_mips_elf_check_relocs): Generate error
	for TLS_TPREL_HI16(/LO16) relocations in shared library.

ld/
	* testsuite/ld-mips-elf/pic-reloc-5.s: Add tests for
	%tprel_hi and %tprel_lo relocations.
	* testsuite/ld-mips-elf/pic-reloc-6.s: Likewise.
	* testsuite/ld-mips-elf/pic-reloc-5.d: Update accordingly.
	* testsuite/ld-mips-elf/pic-reloc-6.d: Likewise.
	* testsuite/ld-mips-elf/pic-reloc-tls.ld: New test linker
	script file.
---
 bfd/elfxx-mips.c                          | 12 ++++++++++++
 ld/testsuite/ld-mips-elf/pic-reloc-5.d    |  8 ++++++--
 ld/testsuite/ld-mips-elf/pic-reloc-5.s    | 12 ++++++++++++
 ld/testsuite/ld-mips-elf/pic-reloc-6.d    |  8 ++++++--
 ld/testsuite/ld-mips-elf/pic-reloc-6.s    | 12 ++++++++++++
 ld/testsuite/ld-mips-elf/pic-reloc-tls.ld |  7 +++++++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 ld/testsuite/ld-mips-elf/pic-reloc-tls.ld

-- 
2.9.5

Patch

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 606c698..40a6f5c 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -9047,6 +9047,18 @@  _bfd_mips_elf_check_relocs (bfd *abfd, struct bfd_link_info *info,
 	{
 	  switch (r_type)
 	    {
+	    case R_MIPS_TLS_TPREL_HI16:
+	    case R_MIPS16_TLS_TPREL_HI16:
+	    case R_MICROMIPS_TLS_TPREL_HI16:
+	    case R_MIPS_TLS_TPREL_LO16:
+	    case R_MIPS16_TLS_TPREL_LO16:
+	    case R_MICROMIPS_TLS_TPREL_LO16:
+	      /* These are okay in PIE, but not in a shared library.  */
+	      if (bfd_link_executable (info))
+		break;
+
+	      /* FALLTHROUGH */
+
 	    case R_MIPS16_HI16:
 	    case R_MIPS_HI16:
 	    case R_MIPS_HIGHER:
diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-5.d b/ld/testsuite/ld-mips-elf/pic-reloc-5.d
index 1b9d07e..ecedb6e 100644
--- a/ld/testsuite/ld-mips-elf/pic-reloc-5.d
+++ b/ld/testsuite/ld-mips-elf/pic-reloc-5.d
@@ -1,6 +1,10 @@ 
 #name: MIPS PIC relocation 5
-#ld: -shared -T pic-reloc-ordinary.ld
+#ld: -shared -T pic-reloc-tls.ld
 #target: [check_shared_lib_support]
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x0\): relocation R_(MICRO|)MIPS_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
-#error:   \(\.text\+0x8\): relocation R_(MICRO|)MIPS_HI16 against `bar' cannot be used when making a shared object; recompile with -fPIC\Z
+#error:   \(\.text\+0x8\): relocation R_(MICRO|)MIPS_HI16 against `bar' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x10\): relocation R_(MICRO|)MIPS_TLS_TPREL_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x14\): relocation R_(MICRO|)MIPS_TLS_TPREL_LO16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x18\): relocation R_(MICRO|)MIPS_TLS_TPREL_HI16 against `global_tls' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x1c\): relocation R_(MICRO|)MIPS_TLS_TPREL_LO16 against `global_tls' cannot be used when making a shared object; recompile with -fPIC\Z
diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-5.s b/ld/testsuite/ld-mips-elf/pic-reloc-5.s
index b8ebd8c..456d834 100644
--- a/ld/testsuite/ld-mips-elf/pic-reloc-5.s
+++ b/ld/testsuite/ld-mips-elf/pic-reloc-5.s
@@ -1,5 +1,6 @@ 
 	.text
 	.globl	foo
+	.globl  global_tls
 	.ent	foo
 foo:
 $LCL:
@@ -7,4 +8,15 @@  $LCL:
 	addiu	$2, %lo($LCL)
 	lui	$2, %hi(bar)
 	addiu	$2, %lo(bar)
+	lui	$a0,%tprel_hi(local_tls)
+	addiu	$a0,$a0,%tprel_lo(local_tls)
+	lui	$a0,%tprel_hi(global_tls)
+	addiu	$a0,$a0,%tprel_lo(global_tls)
 	.end	foo
+	.type	local_tls,%object
+	.type	global_tls,%object
+	.section	.tbss,"awT",@nobits
+local_tls:
+	.word
+global_tls:
+	.word
diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-6.d b/ld/testsuite/ld-mips-elf/pic-reloc-6.d
index 68be687..8a8b550 100644
--- a/ld/testsuite/ld-mips-elf/pic-reloc-6.d
+++ b/ld/testsuite/ld-mips-elf/pic-reloc-6.d
@@ -1,7 +1,11 @@ 
 #name: MIPS PIC relocation 6 (MIPS16)
-#ld: -shared -T pic-reloc-ordinary.ld
+#ld: -shared -T pic-reloc-tls.ld
 #target: [check_shared_lib_support]
 #as: -mips16
 #error: \A[^\n]*: in function `foo':\n
 #error:   \(\.text\+0x0\): relocation R_MIPS16_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
-#error:   \(\.text\+0x8\): relocation R_MIPS16_HI16 against `bar' cannot be used when making a shared object; recompile with -fPIC\Z
+#error:   \(\.text\+0x8\): relocation R_MIPS16_HI16 against `bar' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x10\): relocation R_MIPS16_TLS_TPREL_HI16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x14\): relocation R_MIPS16_TLS_TPREL_LO16 against `a local symbol' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x18\): relocation R_MIPS16_TLS_TPREL_HI16 against `global_tls' cannot be used when making a shared object; recompile with -fPIC\n
+#error:   \(\.text\+0x1c\): relocation R_MIPS16_TLS_TPREL_LO16 against `global_tls' cannot be used when making a shared object; recompile with -fPIC\Z
diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-6.s b/ld/testsuite/ld-mips-elf/pic-reloc-6.s
index 777ea26..5cf5e81 100644
--- a/ld/testsuite/ld-mips-elf/pic-reloc-6.s
+++ b/ld/testsuite/ld-mips-elf/pic-reloc-6.s
@@ -1,5 +1,6 @@ 
 	.text
 	.globl	foo
+	.globl  global_tls
 	.ent	foo
 foo:
 $LCL:
@@ -7,4 +8,15 @@  $LCL:
 	addiu	$2, %lo($LCL)
 	li	$2, %hi(bar)
 	addiu	$2, %lo(bar)
+	li	$a0,%tprel_hi(local_tls)
+	lw	$a1,%tprel_lo(local_tls)($a0)
+	li	$a0,%tprel_hi(global_tls)
+	lw	$a1,%tprel_lo(global_tls)($a0)
 	.end	foo
+	.type	local_tls,%object
+	.type	global_tls,%object
+	.section	.tbss,"awT",@nobits
+local_tls:
+	.word
+global_tls:
+	.word
diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-tls.ld b/ld/testsuite/ld-mips-elf/pic-reloc-tls.ld
new file mode 100644
index 0000000..85af30c
--- /dev/null
+++ b/ld/testsuite/ld-mips-elf/pic-reloc-tls.ld
@@ -0,0 +1,7 @@ 
+SECTIONS
+{
+  bar = foo;
+  .text : { *(.text) }
+  .tbss : { *(.tbss) }
+  /DISCARD/ : { *(*) }
+}