maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Don't crash if PT_TLS is empty. 

llvm-svn: 277202
This commit is contained in:
Rafael Espindola 2016-07-29 19:24:27 +00:00
parent be3ea33fa1
commit 716a94787c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lld/ELF/Writer.cpp
View File

@ -1132,7 +1132,8 @@ template <class ELFT> void Writer<ELFT>::setPhdrs() {
// so round up the size to make sure the offsets are correct.
if (H.p_type == PT_TLS) {
Out<ELFT>::TlsPhdr = &H;
H.p_memsz = alignTo(H.p_memsz, H.p_align);
if (H.p_memsz)
H.p_memsz = alignTo(H.p_memsz, H.p_align);
}
}
}

14
lld/test/ELF/linkerscript/empty-tls.s Normal file
View File

@ -0,0 +1,14 @@
// REQUIRES: x86
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: echo "PHDRS { ph_tls PT_TLS; }" > %t.script
// RUN: ld.lld -o %t.so -T %t.script %t.o -shared
// RUN: llvm-readobj -l %t.so | FileCheck %s
// test that we don't crash with an empty PT_TLS
// CHECK: Type: PT_TLS
// CHECK-NEXT: Offset: 0x0
// CHECK-NEXT: VirtualAddress: 0x0
// CHECK-NEXT: PhysicalAddress: 0x0
// CHECK-NEXT: FileSize: 0
// CHECK-NEXT: MemSize: 0