Index: llvm/trunk/utils/benchmark/CMakeLists.txt =================================================================== --- llvm/trunk/utils/benchmark/CMakeLists.txt +++ llvm/trunk/utils/benchmark/CMakeLists.txt @@ -99,6 +99,7 @@ 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) Index: llvm/trunk/utils/benchmark/README.LLVM =================================================================== --- llvm/trunk/utils/benchmark/README.LLVM +++ llvm/trunk/utils/benchmark/README.LLVM @@ -19,3 +19,5 @@ 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