intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-27 06:06:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Initial support for the local dynamic model ARM TLS relocations:

Browse Source 
- R_ARM_TLS_LDM32
- R_ARM_TLS_LDO32

The local dynamic implementation and tests follows the same model as 
the other ARM TLS models. The R_ARM_TLS_LDO32 is implemented as R_ABS 
expr type as the getVA() for a TLS symbol will return the offset from the 
start of the TLS block.

Differential Revision https://reviews.llvm.org/D22563
 

llvm-svn: 276123
This commit is contained in:
Peter Smith
2016-07-20 14:56:26 +00:00
parent 6de4bd62b1
commit 441cf5d818
2 changed files with 84 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lld/ELF/Target.cpp
View File

@@ -178,6 +178,7 @@ public:
RelExpr getRelExpr(uint32_t Type, const SymbolBody &S) const override;
uint32_t getDynRel(uint32_t Type) const override;
uint64_t getImplicitAddend(const uint8_t *Buf, uint32_t Type) const override;
bool isTlsLocalDynamicRel(uint32_t Type) const override;
bool isTlsGlobalDynamicRel(uint32_t Type) const override;
bool isTlsInitialExecRel(uint32_t Type) const override;
void writeGotPlt(uint8_t *Buf, const SymbolBody &S) const override;
@@ -1523,6 +1524,8 @@ RelExpr ARMTargetInfo::getRelExpr(uint32_t Type, const SymbolBody &S) const {
return R_GOT_PC;
case R_ARM_TLS_GD32:
return R_TLSGD_PC;
case R_ARM_TLS_LDM32:
return R_TLSLD_PC;
case R_ARM_BASE_PREL:
// B(S) + A - P
// FIXME: currently B(S) assumed to be .got, this may not hold for all
@@ -1624,6 +1627,8 @@ void ARMTargetInfo::relocateOne(uint8_t *Loc, uint32_t Type,
case R_ARM_REL32:
case R_ARM_TLS_GD32:
case R_ARM_TLS_IE32:
case R_ARM_TLS_LDM32:
case R_ARM_TLS_LDO32:
case R_ARM_TLS_LE32:
write32le(Loc, Val);
break;
@@ -1749,6 +1754,8 @@ uint64_t ARMTargetInfo::getImplicitAddend(const uint8_t *Buf,
case R_ARM_GOT_PREL:
case R_ARM_REL32:
case R_ARM_TLS_GD32:
case R_ARM_TLS_LDM32:
case R_ARM_TLS_LDO32:
case R_ARM_TLS_IE32:
case R_ARM_TLS_LE32:
return SignExtend64<32>(read32le(Buf));
@@ -1808,6 +1815,10 @@ uint64_t ARMTargetInfo::getImplicitAddend(const uint8_t *Buf,
}
}
bool ARMTargetInfo::isTlsLocalDynamicRel(uint32_t Type) const {
return Type == R_ARM_TLS_LDO32 || Type == R_ARM_TLS_LDM32;
}
bool ARMTargetInfo::isTlsGlobalDynamicRel(uint32_t Type) const {
return Type == R_ARM_TLS_GD32;
}

73
lld/test/ELF/arm-tls-ldm32.s Normal file
View File

@@ -0,0 +1,73 @@
// RUN: llvm-mc %s -o %t.o -filetype=obj -triple=armv7a-linux-gnueabi
// RUN: ld.lld %t.o -o %t.so -shared
// RUN: llvm-readobj -s -dyn-relocations %t.so | FileCheck --check-prefix=SEC %s
// RUN: llvm-objdump -d -triple=armv7a-linux-gnueabi %t.so | FileCheck %s
// REQUIRES: arm
// Test the handling of the local-dynamic TLS model. Dynamic loader finds
// module index R_ARM_TLS_DTPMOD32. The offset in the next GOT slot is 0
// The R_ARM_TLS_LDO is the offset of the variable within the TLS block.
.global __tls_get_addr
.text
.p2align 2
.global _start
.syntax unified
.arm
.type _start, %function
_start:
.L0:
nop
.word x(tlsldm) + (. - .L0 - 8)
.word x(tlsldo)
.word y(tlsldo)
.section .tbss,"awT",%nobits
.p2align 2
.type y, %object
y:
.space 4
.section .tdata,"awT",%progbits
.p2align 2
.type x, %object
x:
.word 10
// SEC: Name: .tdata
// SEC-NEXT: Type: SHT_PROGBITS
// SEC-NEXT: Flags [
// SEC-NEXT: SHF_ALLOC
// SEC-NEXT: SHF_TLS
// SEC-NEXT: SHF_WRITE
// SEC-NEXT: ]
// SEC-NEXT: Address: 0x2000
// SEC: Size: 4
// SEC: Name: .tbss
// SEC-NEXT: Type: SHT_NOBITS (0x8)
// SEC-NEXT: Flags [
// SEC-NEXT: SHF_ALLOC
// SEC-NEXT: SHF_TLS
// SEC-NEXT: SHF_WRITE
// SEC-NEXT: ]
// SEC-NEXT: Address: 0x2004
// SEC: Size: 4
// SEC: Dynamic Relocations {
// SEC-NEXT: 0x204C R_ARM_TLS_DTPMOD32 - 0x0
// CHECK: Disassembly of section .text:
// CHECK-NEXT: _start:
// CHECK-NEXT: 1000: 00 f0 20 e3 nop
// (0x204c - 0x1004) + (0x1004 - 0x1000 - 8) = 0x1044
// CHECK: 1004: 44 10 00 00
// CHECK-NEXT: 1008: 00 00 00 00
// CHECK-NEXT: 100c: 04 00 00 00
// CHECK-EXE: Disassembly of section .text:
// CHECK-NEXT-EXE: _start:
// CHECK-NEXT-EXE: 11000: 00 f0 20 e3 nop
// CHECK-EXE: 11004: fc 0f 00 00
// CHECK-EXE: 11008: 00 00 00 00
// CHECK-EXE: 1100c: 04 00 00 00