blob: e5fa1f7efec03784a3485a4feae35562ff21d3a6 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
--- src/3rdparty/chromium/base/cpu.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/cpu.cc
@@ -15,7 +15,7 @@
#include "base/stl_util.h"
#include "build/build_config.h"
-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
#include "base/files/file_util.h"
#endif
@@ -98,7 +98,7 @@ uint64_t xgetbv(uint32_t xcr) {
#endif // ARCH_CPU_X86_FAMILY
-#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
std::string* CpuInfoBrand() {
static std::string* brand = []() {
// This function finds the value from /proc/cpuinfo under the key "model
@@ -128,7 +128,7 @@ std::string* CpuInfoBrand() {
return brand;
}
#endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
- // defined(OS_LINUX))
+ // defined(OS_LINUX) || defined(OS_BSD))
} // namespace
@@ -252,7 +252,7 @@ void CPU::Initialize() {
}
}
#elif defined(ARCH_CPU_ARM_FAMILY)
-#if (defined(OS_ANDROID) || defined(OS_LINUX))
+#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD))
cpu_brand_ = *CpuInfoBrand();
#elif defined(OS_WIN)
// Windows makes high-resolution thread timing information available in
|
