From 485e561f8d53817ec4d89cd299dd024c4997ac35 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Mon, 19 Apr 2021 13:17:47 +0200
Subject: [PATCH] Try to unbreak the compiler-rt build on s390x

Introduced by:
3d1d7156e9a9a794ba649b79e27fe448274fd558
---
 compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
index f1a0f89..e94da95 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(
-- 
2.7.4