Skip to content

S
swiftshader
Commit 89c13815 by Nico Weber
Options

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: 's avatarNicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNico Weber <thakis@chromium.org> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
parent 86509d90
Showing with 15 additions and 15 deletions
third_party/llvm-7.0/configs/android/include/llvm/Config/llvm-config.h
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#endif #endif
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-7.0/configs/darwin/include/llvm/Config/llvm-config.h
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#endif #endif
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-7.0/configs/fuchsia/include/llvm/Config/llvm-config.h
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#endif #endif
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-7.0/configs/linux/include/llvm/Config/llvm-config.h
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#endif #endif
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-7.0/configs/windows/include/llvm/Config/llvm-config.h
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-pc-win32" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-pc-win32"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-subzero/build/Android/include/llvm/Config/config.h
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 1 #define LLVM_ENABLE_ZLIB 1
......
third_party/llvm-subzero/build/Android/include/llvm/Config/llvm-config.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/config.h
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 1 #define LLVM_ENABLE_ZLIB 1
......
third_party/llvm-subzero/build/Fuchsia/include/llvm/Config/llvm-config.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 1 #define LLVM_ENABLE_ZLIB 1
......
third_party/llvm-subzero/build/Linux/include/llvm/Config/llvm-config.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-subzero/build/MacOS/include/llvm/Config/config.h
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 1 #define LLVM_ENABLE_ZLIB 1
......
third_party/llvm-subzero/build/MacOS/include/llvm/Config/llvm-config.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0" #define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-apple-darwin16.3.0"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
third_party/llvm-subzero/build/Windows/include/llvm/Config/config.h
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32" #define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Define if zlib compression is available */ /* Define if zlib compression is available */
#define LLVM_ENABLE_ZLIB 0 #define LLVM_ENABLE_ZLIB 0
......
third_party/llvm-subzero/build/Windows/include/llvm/Config/llvm-config.h
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32" #define LLVM_DEFAULT_TARGET_TRIPLE "i686-pc-win32"
/* Define if threads enabled */ /* Define if threads enabled */
#define LLVM_ENABLE_THREADS 1 #define LLVM_ENABLE_THREADS 0
/* Has gcc/MSVC atomic intrinsics */ /* Has gcc/MSVC atomic intrinsics */
#define LLVM_HAS_ATOMICS 1 #define LLVM_HAS_ATOMICS 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment