This is an archive of the discontinued LLVM Phabricator instance.

Differential D52262

[benchmark] Cherrypick fix for MinGW/ARM from upstream
ClosedPublic

Authored by mstorsjo on Sep 19 2018, 5:42 AM.

Details

Reviewers
lebedev.ri
kbobyrev
javed.absar
Commits
rG023dfa571632: [benchmark] Cherrypick fix for MinGW/ARM from upstream
rL342549: [benchmark] Cherrypick fix for MinGW/ARM from upstream
Summary

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.)

Diff Detail

Event Timeline

mstorsjo created this revision.Sep 19 2018, 5:42 AM
Herald added a reviewer: javed.absar. · View Herald TranscriptSep 19 2018, 5:42 AM
Herald added subscribers: chrib, kristof.beyls. · View Herald Transcript
lebedev.ri accepted this revision.Sep 19 2018, 5:45 AM

LG

This revision is now accepted and ready to land.Sep 19 2018, 5:45 AM
Closed by commit rL342549: [benchmark] Cherrypick fix for MinGW/ARM from upstream (authored by mstorsjo). · Explain WhySep 19 2018, 7:32 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
utils/
benchmark/
2 lines
src/
2 lines
3 lines

Diff 166105

utils/benchmark/README.LLVM

Show All 11 Lines
* https://github.com/google/benchmark/commit/f85304e4e3a0e4e1bf15b91720df4a19e90b589f * https://github.com/google/benchmark/commit/f85304e4e3a0e4e1bf15b91720df4a19e90b589f
is applied on top of the v1.4.1 to silence compiler warnings is applied on top of the v1.4.1 to silence compiler warnings
* https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e * https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e
is applied to comply with the LLVM's required CMake version is applied to comply with the LLVM's required CMake version
* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc * https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc
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

utils/benchmark/src/cycleclock.h

Show All 35 Lines
// declarations of some other intrinsics, breaking compilation. // declarations of some other intrinsics, breaking compilation.
// Therefore, we simply declare __rdtsc ourselves. See also // Therefore, we simply declare __rdtsc ourselves. See also
// http://connect.microsoft.com/VisualStudio/feedback/details/262047 // http://connect.microsoft.com/VisualStudio/feedback/details/262047
#if defined(COMPILER_MSVC) && !defined(_M_IX86) #if defined(COMPILER_MSVC) && !defined(_M_IX86)
extern "C" uint64_t __rdtsc(); 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
#ifdef BENCHMARK_OS_EMSCRIPTEN #ifdef BENCHMARK_OS_EMSCRIPTEN
#include <emscripten.h> #include <emscripten.h>
#endif #endif
▲ Show 20 Lines • Show All 125 Lines • Show Last 20 Lines

utils/benchmark/src/internal_macros.h

Show All 29 Lines
#else #else
#define BENCHMARK_NORETURN #define BENCHMARK_NORETURN
#endif #endif
#if defined(__CYGWIN__) #if defined(__CYGWIN__)
#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"
#if defined(TARGET_OS_MAC) #if defined(TARGET_OS_MAC)
#define BENCHMARK_OS_MACOSX 1 #define BENCHMARK_OS_MACOSX 1
#if defined(TARGET_OS_IPHONE) #if defined(TARGET_OS_IPHONE)
#define BENCHMARK_OS_IOS 1 #define BENCHMARK_OS_IOS 1
#endif #endif
Show All 33 Lines