Build LLVM with threads disabled.

As far as I can tell, swiftshader doesn't use LLVM's threading capabilities
for anything, and disabling them sidesteps an issue with libc++/win -- so
turn them off.

Bug: chromium:944811
Change-Id: Idf7eee5aa4693e9d2dcb744638ad9de53f714173
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/27849
Presubmit-Ready: Nicolas Capens <nicolascapens@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nico Weber <thakis@chromium.org>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

diff --git a/third_party/llvm-7.0/configs/android/include/llvm/Config/llvm-config.h b/third_party/llvm-7.0/configs/android/include/llvm/Config/llvm-config.h
index 9219b63..f7d3c9b 100644 (file)
--- a/third_party/llvm-7.0/configs/android/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-7.0/configs/android/include/llvm/Config/llvm-config.h
@@ -34,7 +34,7 @@
 #endif
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-7.0/configs/darwin/include/llvm/Config/llvm-config.h b/third_party/llvm-7.0/configs/darwin/include/llvm/Config/llvm-config.h
index 54d348b..831460c 100644 (file)
--- a/third_party/llvm-7.0/configs/darwin/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-7.0/configs/darwin/include/llvm/Config/llvm-config.h
@@ -28,7 +28,7 @@
 #endif
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-7.0/configs/fuchsia/include/llvm/Config/llvm-config.h b/third_party/llvm-7.0/configs/fuchsia/include/llvm/Config/llvm-config.h
index ec30fec..f906dc5 100644 (file)
--- a/third_party/llvm-7.0/configs/fuchsia/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-7.0/configs/fuchsia/include/llvm/Config/llvm-config.h
@@ -30,7 +30,7 @@
 #endif
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h b/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
index 0aa1094..ff19b6b 100644 (file)
--- a/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
@@ -38,7 +38,7 @@
 #endif
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h b/third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h
index 7b422cb..c408177 100644 (file)
--- a/third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h
@@ -24,7 +24,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-pc-win32"\r
 \r
 /* Define if threads enabled */\r
-#define LLVM_ENABLE_THREADS 1\r
+#define LLVM_ENABLE_THREADS 0\r
 \r
 /* Has gcc/MSVC atomic intrinsics */\r
 #define LLVM_HAS_ATOMICS 1\r

diff --git a/third_party/llvm-subzero/build/Android/include/llvm/Config/config.h b/third_party/llvm-subzero/build/Android/include/llvm/Config/config.h
index 204c09e..1b5d976 100644 (file)
--- a/third_party/llvm-subzero/build/Android/include/llvm/Config/config.h
+++ b/third_party/llvm-subzero/build/Android/include/llvm/Config/config.h
@@ -337,7 +337,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1

diff --git a/third_party/llvm-subzero/build/Android/include/llvm/Config/llvm-config.h b/third_party/llvm-subzero/build/Android/include/llvm/Config/llvm-config.h
index 1ca19e0..dea7713 100644 (file)
--- a/third_party/llvm-subzero/build/Android/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-subzero/build/Android/include/llvm/Config/llvm-config.h
@@ -21,7 +21,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/config.h b/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/config.h
index 2d3848b..9180f54 100644 (file)
--- a/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/config.h
+++ b/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/config.h
@@ -337,7 +337,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1

diff --git a/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/llvm-config.h b/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/llvm-config.h
index 1ca19e0..dea7713 100644 (file)
--- a/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/llvm-config.h
@@ -21,7 +21,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h b/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
index e14edbd..f60b2fa 100644 (file)
--- a/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
+++ b/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
@@ -337,7 +337,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1

diff --git a/third_party/llvm-subzero/build/Linux/include/llvm/Config/llvm-config.h b/third_party/llvm-subzero/build/Linux/include/llvm/Config/llvm-config.h
index 1ca19e0..dea7713 100644 (file)
--- a/third_party/llvm-subzero/build/Linux/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-subzero/build/Linux/include/llvm/Config/llvm-config.h
@@ -21,7 +21,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-subzero/build/MacOS/include/llvm/Config/config.h b/third_party/llvm-subzero/build/MacOS/include/llvm/Config/config.h
index 9ccfb50..0542613 100644 (file)
--- a/third_party/llvm-subzero/build/MacOS/include/llvm/Config/config.h
+++ b/third_party/llvm-subzero/build/MacOS/include/llvm/Config/config.h
@@ -337,7 +337,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Define if zlib compression is available */
 #define LLVM_ENABLE_ZLIB 1

diff --git a/third_party/llvm-subzero/build/MacOS/include/llvm/Config/llvm-config.h b/third_party/llvm-subzero/build/MacOS/include/llvm/Config/llvm-config.h
index 12329b5..737ca3c 100644 (file)
--- a/third_party/llvm-subzero/build/MacOS/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-subzero/build/MacOS/include/llvm/Config/llvm-config.h
@@ -21,7 +21,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0"
 
 /* Define if threads enabled */
-#define LLVM_ENABLE_THREADS 1
+#define LLVM_ENABLE_THREADS 0
 
 /* Has gcc/MSVC atomic intrinsics */
 #define LLVM_HAS_ATOMICS 1

diff --git a/third_party/llvm-subzero/build/Windows/include/llvm/Config/config.h b/third_party/llvm-subzero/build/Windows/include/llvm/Config/config.h
index 7d86562..7e54490 100644 (file)
--- a/third_party/llvm-subzero/build/Windows/include/llvm/Config/config.h
+++ b/third_party/llvm-subzero/build/Windows/include/llvm/Config/config.h
@@ -337,7 +337,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"\r
 \r
 /* Define if threads enabled */\r
-#define LLVM_ENABLE_THREADS 1\r
+#define LLVM_ENABLE_THREADS 0\r
 \r
 /* Define if zlib compression is available */\r
 #define LLVM_ENABLE_ZLIB 0\r

diff --git a/third_party/llvm-subzero/build/Windows/include/llvm/Config/llvm-config.h b/third_party/llvm-subzero/build/Windows/include/llvm/Config/llvm-config.h
index ec5620d..5fd3f2a 100644 (file)
--- a/third_party/llvm-subzero/build/Windows/include/llvm/Config/llvm-config.h
+++ b/third_party/llvm-subzero/build/Windows/include/llvm/Config/llvm-config.h
@@ -21,7 +21,7 @@
 #define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"\r
 \r
 /* Define if threads enabled */\r
-#define LLVM_ENABLE_THREADS 1\r
+#define LLVM_ENABLE_THREADS 0\r
 \r
 /* Has gcc/MSVC atomic intrinsics */\r
 #define LLVM_HAS_ATOMICS 1\r