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

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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 4335227db6a7b84a2246f857249e46bf90aff66c..320e06ac7e9dad5c50e367a5733e250d51d76483 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-21  Faraz Shahbazker  <fshahbazker@wavecomp.com>
+
+       * elfxx-mips.c (_bfd_mips_elf_check_relocs): Generate error
+       for TLS_TPREL_HI16(/LO16) relocations in shared library.
+
 2019-05-21  Faraz Shahbazker  <fshahbazker@wavecomp.com>
 
        * elfxx-mips.c (_bfd_mips_elf_check_relocs): Add NULL pointer

diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 28e95bcc08a70d390b76be46b4d6714a57e8c05a..c64f90c3bb66b1d7d2517dae0be2130605842128 100644 (file)
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -9102,6 +9102,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/ChangeLog b/ld/ChangeLog
index beba62e233da63151e932147477b2657a2a95966..eb0dd9bb8fe3e006efbd590fa238de9ce6a18a6f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2019-05-21  Faraz Shahbazker  <fshahbazker@wavecomp.com>
+
+       * 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.
+
 2019-05-21  Faraz Shahbazker  <fshahbazker@wavecomp.com>
 
        * testsuite/ld-mips-elf/pic-reloc-5.d: New test.

diff --git a/ld/testsuite/ld-mips-elf/pic-reloc-5.d b/ld/testsuite/ld-mips-elf/pic-reloc-5.d
index 1b9d07ea6ee53e61507b12e16422ab681b0ed418..ecedb6e0c1b1884822fba2fb88ae9a132d0355eb 100644 (file)
--- 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 b8ebd8c2a216f009ea4f85d36e5395020f940fce..456d834a10eb3de042bb9f39a696759a63a31285 100644 (file)
--- 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 68be6873eabd29269ed80088cbbf7c612b456954..8a8b5501e926edd852bb36c40226c5a963fada41 100644 (file)
--- 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 777ea260f10e0c77d2195f9e8546e75648b3bfb4..5cf5e81e4d0267ba2731e0ead565e74a3e096fd0 100644 (file)
--- 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 (file)
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/ : { *(*) }
+}