[PATCH] D18960: [lld] Initial implementation of TLSDESC relocation handling

[Rui Ueyama via llvm-commits]

ruiu added inline comments.

================
Comment at: ELF/Writer.cpp:357
@@ -311,2 +356,3 @@
     if (!Target->canRelaxTls(Type, &Body)) {
+<<<<<<< HEAD
       if (Out<ELFT>::Got->addDynTlsEntry(Body)) {
----------------
Can you upload this again? This patch contains merge conflict markers.


http://reviews.llvm.org/D18960