[compiler-rt] 485e561 - Try to unbreak the compiler-rt build on s390x

[Sylvestre Ledru via llvm-commits]

Author: Sylvestre Ledru
Date: 2021-04-19T13:17:47+02:00
New Revision: 485e561f8d53817ec4d89cd299dd024c4997ac35

URL: https://github.com/llvm/llvm-project/commit/485e561f8d53817ec4d89cd299dd024c4997ac35
DIFF: https://github.com/llvm/llvm-project/commit/485e561f8d53817ec4d89cd299dd024c4997ac35.diff

LOG: Try to unbreak the compiler-rt build on s390x

Introduced by:
3d1d7156e9a9a794ba649b79e27fe448274fd558

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
index f1a0f8948f905..e94da9597a734 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -328,8 +328,8 @@ static int CollectStaticTlsBlocks(struct dl_phdr_info *info, size_t size,
     // and FreeBSD.
     size_t mod_and_off[2] = {info->dlpi_tls_modid, 0};
     begin = (uptr)__tls_get_addr(mod_and_off);
-#endif
   }
+#endif
   for (unsigned i = 0; i != info->dlpi_phnum; ++i)
     if (info->dlpi_phdr[i].p_type == PT_TLS) {
       static_cast<InternalMmapVector<TlsBlock> *>(data)->push_back(