maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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

llvm-svn: 342549
This commit is contained in:
Martin Storsjo 2018-09-19 14:30:45 +00:00
parent f50023d37c
commit 023dfa5716
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/utils/benchmark/README.LLVM
View File

@ -17,3 +17,5 @@ Changes:
is applied to fix 32-bit build failure on macOS is applied to fix 32-bit build failure on macOS
* https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c * https://github.com/google/benchmark/commit/52613079824ac58d06c070aa9fbbb186a5859e2c
is applied to fix cross compilation with MinGW headers 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

2
llvm/utils/benchmark/src/cycleclock.h
View File

@ -41,7 +41,7 @@ extern "C" uint64_t __rdtsc();
#pragma intrinsic(__rdtsc) #pragma intrinsic(__rdtsc)
#endif #endif
#ifndef BENCHMARK_OS_WINDOWS #if !defined(BENCHMARK_OS_WINDOWS) || defined(BENCHMARK_OS_MINGW)
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#endif #endif

3
llvm/utils/benchmark/src/internal_macros.h
View File

@ -35,6 +35,9 @@
#define BENCHMARK_OS_CYGWIN 1 #define BENCHMARK_OS_CYGWIN 1
#elif defined(_WIN32) #elif defined(_WIN32)
#define BENCHMARK_OS_WINDOWS 1 #define BENCHMARK_OS_WINDOWS 1
#if defined(__MINGW32__)
#define BENCHMARK_OS_MINGW 1
#endif
#elif defined(__APPLE__) #elif defined(__APPLE__)
#define BENCHMARK_OS_APPLE 1 #define BENCHMARK_OS_APPLE 1
#include "TargetConditionals.h" #include "TargetConditionals.h"