From: LLVM Packaging Team <pkg-llvm-team@lists.alioth.debian.org>
Date: Sat, 15 Aug 2020 20:34:33 +0000 (+0100)
Subject: kfreebsd-libcxx-threads-detection
X-Git-Tag: archive/raspbian/1%8.0.1-10+rpi1^2~22
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=69095412e6ae7632865ed3fa6fd5269c21afe79b;p=llvm-toolchain-8.git

kfreebsd-libcxx-threads-detection

===================================================================

Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name kfreebsd-libcxx-threads-detection.diff
---

diff --git a/libcxx/include/__config b/libcxx/include/__config
index f0bc3483f..7dedd0e42 100644
--- a/libcxx/include/__config
+++ b/libcxx/include/__config
@@ -1157,6 +1157,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanitizer_annotate_contiguous_container(
     !defined(_LIBCPP_HAS_THREAD_API_WIN32) && \
     !defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
 #  if defined(__FreeBSD__) || \
+      defined(__FreeBSD_kernel__) || \
       defined(__Fuchsia__) || \
       defined(__NetBSD__) || \
       defined(__linux__) || \