Index: llvm/trunk/utils/benchmark/README.LLVM =================================================================== --- llvm/trunk/utils/benchmark/README.LLVM +++ llvm/trunk/utils/benchmark/README.LLVM @@ -17,3 +17,5 @@ is applied to fix 32-bit build failure on macOS * https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c 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 Index: llvm/trunk/utils/benchmark/src/cycleclock.h =================================================================== --- llvm/trunk/utils/benchmark/src/cycleclock.h +++ llvm/trunk/utils/benchmark/src/cycleclock.h @@ -41,7 +41,7 @@ #pragma intrinsic(__rdtsc) #endif -#ifndef BENCHMARK_OS_WINDOWS +#if !defined(BENCHMARK_OS_WINDOWS) || defined(BENCHMARK_OS_MINGW) #include #include #endif Index: llvm/trunk/utils/benchmark/src/internal_macros.h =================================================================== --- llvm/trunk/utils/benchmark/src/internal_macros.h +++ llvm/trunk/utils/benchmark/src/internal_macros.h @@ -35,6 +35,9 @@ #define BENCHMARK_OS_CYGWIN 1 #elif defined(_WIN32) #define BENCHMARK_OS_WINDOWS 1 + #if defined(__MINGW32__) + #define BENCHMARK_OS_MINGW 1 + #endif #elif defined(__APPLE__) #define BENCHMARK_OS_APPLE 1 #include "TargetConditionals.h"