<div dir="ltr">Hi Fangrui,<div><br></div><div>it seems that this commit broke AArch64 full bot, the first issues were here observed in the link below,</div><div><br></div><div><a href="https://lab.llvm.org/buildbot/#/builders/7/builds/2496">https://lab.llvm.org/buildbot/#/builders/7/builds/2496</a><br></div><div><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sun, 18 Apr 2021 at 19:42, Fangrui Song via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Fangrui Song<br>
Date: 2021-04-18T10:42:44-07:00<br>
New Revision: 3d1d7156e9a9a794ba649b79e27fe448274fd558<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/3d1d7156e9a9a794ba649b79e27fe448274fd558" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/3d1d7156e9a9a794ba649b79e27fe448274fd558</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/3d1d7156e9a9a794ba649b79e27fe448274fd558.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/3d1d7156e9a9a794ba649b79e27fe448274fd558.diff</a><br>
<br>
LOG: [sanitizer] Don't call __tls_get_addr on s390x after D98926<br>
<br>
glibc s390x doesn't define __tls_get_addr.<br>
<br>
Fix PR50017<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp<br>
index d5f61e10d7530..f1a0f8948f905 100644<br>
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp<br>
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp<br>
@@ -322,11 +322,13 @@ static int CollectStaticTlsBlocks(struct dl_phdr_info *info, size_t size,<br>
   if (!info->dlpi_tls_modid)<br>
     return 0;<br>
   uptr begin = (uptr)info->dlpi_tls_data;<br>
+#ifndef __s390__<br>
   if (!g_use_dlpi_tls_data) {<br>
     // Call __tls_get_addr as a fallback. This forces TLS allocation on glibc<br>
     // and FreeBSD.<br>
     size_t mod_and_off[2] = {info->dlpi_tls_modid, 0};<br>
     begin = (uptr)__tls_get_addr(mod_and_off);<br>
+#endif<br>
   }<br>
   for (unsigned i = 0; i != info->dlpi_phnum; ++i)<br>
     if (info->dlpi_phdr[i].p_type == PT_TLS) {<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>