FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Faraz Shahbazker 2019-05-18 01:19:04 -07:00
parent 304f09d0d4
commit b474a2022d
8 changed files with 70 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bfd/ChangeLog
View file

@ -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

12
bfd/elfxx-mips.c
View file

@ -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:

10
ld/ChangeLog
View file

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

8
ld/testsuite/ld-mips-elf/pic-reloc-5.d
View file

@ -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

12
ld/testsuite/ld-mips-elf/pic-reloc-5.s
View file

@ -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

8
ld/testsuite/ld-mips-elf/pic-reloc-6.d
View file

@ -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

12
ld/testsuite/ld-mips-elf/pic-reloc-6.s
View file

@ -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

7
ld/testsuite/ld-mips-elf/pic-reloc-tls.ld Normal file
View file

@ -0,0 +1,7 @@
SECTIONS
{
bar = foo;
.text : { *(.text) }
.tbss : { *(.tbss) }
/DISCARD/ : { *(*) }
}