Don't crash if PT_TLS is empty.

llvm-svn: 277202

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 394ae89..7dafdb7 100644 (file)
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -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);
     }
   }
 }

diff --git a/lld/test/ELF/linkerscript/empty-tls.s b/lld/test/ELF/linkerscript/empty-tls.s
new file mode 100644 (file)
index 0000000..919ccbf
--- /dev/null
+++ b/lld/test/ELF/linkerscript/empty-tls.s
@@ -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