[PATCH] D52262: [benchmark] Cherrypick fix for MinGW/ARM from upstream

[Martin Storsjö via Phabricator via llvm-commits]

mstorsjo created this revision.
mstorsjo added reviewers: lebedev.ri, kbobyrev.
Herald added a reviewer: javed.absar.
Herald added subscribers: chrib, kristof.beyls.

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


Repository:
  rL LLVM

https://reviews.llvm.org/D52262

Files:
  utils/benchmark/README.LLVM
  utils/benchmark/src/cycleclock.h
  utils/benchmark/src/internal_macros.h


Index: utils/benchmark/src/internal_macros.h
===================================================================
--- utils/benchmark/src/internal_macros.h
+++ 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"
Index: utils/benchmark/src/cycleclock.h
===================================================================
--- utils/benchmark/src/cycleclock.h
+++ 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 <sys/time.h>
 #include <time.h>
 #endif
Index: utils/benchmark/README.LLVM
===================================================================
--- utils/benchmark/README.LLVM
+++ 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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52262.166105.patch
Type: text/x-patch
Size: 1380 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180919/dac028da/attachment.bin>