diff options
| -rw-r--r-- | llvm/utils/benchmark/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | llvm/utils/benchmark/README.LLVM | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/llvm/utils/benchmark/CMakeLists.txt b/llvm/utils/benchmark/CMakeLists.txt index 6522ecf9d6b..686846bf1e0 100644 --- a/llvm/utils/benchmark/CMakeLists.txt +++ b/llvm/utils/benchmark/CMakeLists.txt @@ -99,6 +99,7 @@ if (MSVC) if (NOT BENCHMARK_ENABLE_EXCEPTIONS) add_cxx_compiler_flag(-EHs-) add_cxx_compiler_flag(-EHa-) + add_definitions(-D_HAS_EXCEPTIONS=0) endif() # Link time optimisation if (BENCHMARK_ENABLE_LTO) diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM index 0121b145ded..5a20ec665ad 100644 --- a/llvm/utils/benchmark/README.LLVM +++ b/llvm/utils/benchmark/README.LLVM @@ -19,3 +19,5 @@ Changes: is applied to fix cross compilation with MinGW headers * https://github.com/google/benchmark/commit/439d6b1c2a6da5cb6adc4c4dfc555af235722396 is applied to fix building with MinGW headers for ARM +* https://github.com/google/benchmark/commit/a9b31c51b1ee7ec7b31438c647123c2cbac5d956 + is applied to disable exceptions in Microsoft STL when exceptions are disabled |
