llvm.org GIT mirror llvm / 80b0618
[benchmark] Cherrypick fix for MinGW/ARM from upstream This fixes building for Windows on ARM, with MinGW headers. (Building for Windows on ARM with Windows SDK still is unsupported by the benchmark library.) Differential Revision: https://reviews.llvm.org/D52262 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@342549 91177308-0d34-0410-b5e6-96231b3b80d8 Martin Storsjo 11 months ago
3 changed file(s) with 6 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
1616 is applied to fix 32-bit build failure on macOS
1717 * https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c
1818 is applied to fix cross compilation with MinGW headers
19 * https://github.com/google/benchmark/commit/439d6b1c2a6da5cb6adc4c4dfc555af235722396
20 is applied to fix building with MinGW headers for ARM
4040 #pragma intrinsic(__rdtsc)
4141 #endif
4242
43 #ifndef BENCHMARK_OS_WINDOWS
43 #if !defined(BENCHMARK_OS_WINDOWS) || defined(BENCHMARK_OS_MINGW)
4444 #include
4545 #include
4646 #endif
3434 #define BENCHMARK_OS_CYGWIN 1
3535 #elif defined(_WIN32)
3636 #define BENCHMARK_OS_WINDOWS 1
37 #if defined(__MINGW32__)
38 #define BENCHMARK_OS_MINGW 1
39 #endif
3740 #elif defined(__APPLE__)
3841 #define BENCHMARK_OS_APPLE 1
3942 #include "TargetConditionals.h"