diff options
| author | Kirill Bobyrev <kbobyrev.opensource@gmail.com> | 2018-09-05 14:15:39 +0000 |
|---|---|---|
| committer | Kirill Bobyrev <kbobyrev.opensource@gmail.com> | 2018-09-05 14:15:39 +0000 |
| commit | 75b31c28f958854f23ae3cc2132c1cadbdeb6250 (patch) | |
| tree | c1b759782e708e34689f874ae089e8b77ee405b3 | |
| parent | 9abad4814dca14bc9eee63f1c7f23b092442826b (diff) | |
| download | llvm-75b31c28f958854f23ae3cc2132c1cadbdeb6250.zip llvm-75b31c28f958854f23ae3cc2132c1cadbdeb6250.tar.gz llvm-75b31c28f958854f23ae3cc2132c1cadbdeb6250.tar.bz2 | |
[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
llvm-svn: 341469
| -rw-r--r-- | llvm/utils/benchmark/README.LLVM | 2 | ||||
| -rw-r--r-- | llvm/utils/benchmark/src/sysinfo.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM index 33d2e40..332632a 100644 --- a/llvm/utils/benchmark/README.LLVM +++ b/llvm/utils/benchmark/README.LLVM @@ -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 diff --git a/llvm/utils/benchmark/src/sysinfo.cc b/llvm/utils/benchmark/src/sysinfo.cc index d19d0ef..b76d0b9 100644 --- a/llvm/utils/benchmark/src/sysinfo.cc +++ b/llvm/utils/benchmark/src/sysinfo.cc @@ -288,7 +288,7 @@ std::vector<CPUInfo::CacheInfo> GetCacheSizesMacOSX() { 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]}, |