[llvm] r341469 - [benchmark] Fix 32-bit build failure

[Kirill Bobyrev via llvm-commits]

Author: omtcyfz
Date: Wed Sep  5 07:15:39 2018
New Revision: 341469

URL: http://llvm.org/viewvc/llvm-project?rev=341469&view=rev
Log:
[benchmark] Fix 32-bit build failure

This patch applies upstream commit:
https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc

Tim Northover pointed out that benchmark build might be broken on 32-bit
macOS. This commit by Roman Lebedev (lebedev.ri) resolves the issue.

Reviewed By: lebedev.ri

Differential Revision: https://reviews.llvm.org/D51677

Modified:
    llvm/trunk/utils/benchmark/README.LLVM
    llvm/trunk/utils/benchmark/src/sysinfo.cc

Modified: llvm/trunk/utils/benchmark/README.LLVM
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/README.LLVM?rev=341469&r1=341468&r2=341469&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/README.LLVM (original)
+++ llvm/trunk/utils/benchmark/README.LLVM Wed Sep  5 07:15:39 2018
@@ -13,3 +13,5 @@ Changes:
   is applied on top of the v1.4.1 to silence compiler warnings
 * https://github.com/google/benchmark/commit/505be96ab23056580a3a2315abba048f4428b04e
   is applied to comply with the LLVM's required CMake version
+* https://github.com/google/benchmark/commit/f0901417c89d123474e6b91365029cfe32cf89dc
+  is applied to fix 32-bit build failure on macOS

Modified: llvm/trunk/utils/benchmark/src/sysinfo.cc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/benchmark/src/sysinfo.cc?rev=341469&r1=341468&r2=341469&view=diff
==============================================================================
--- llvm/trunk/utils/benchmark/src/sysinfo.cc (original)
+++ llvm/trunk/utils/benchmark/src/sysinfo.cc Wed Sep  5 07:15:39 2018
@@ -288,7 +288,7 @@ std::vector<CPUInfo::CacheInfo> GetCache
     std::string name;
     std::string type;
     int level;
-    size_t num_sharing;
+    uint64_t num_sharing;
   } Cases[] = {{"hw.l1dcachesize", "Data", 1, CacheCounts[1]},
                {"hw.l1icachesize", "Instruction", 1, CacheCounts[1]},
                {"hw.l2cachesize", "Unified", 2, CacheCounts[2]},