summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-base_cpu.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-base_cpu.cc')
-rw-r--r--www/chromium/files/patch-base_cpu.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc
index b56fe344b0ce..231561a3a542 100644
--- a/www/chromium/files/patch-base_cpu.cc
+++ b/www/chromium/files/patch-base_cpu.cc
@@ -1,15 +1,15 @@
---- base/cpu.cc.orig 2019-07-29 18:05:46 UTC
+--- base/cpu.cc.orig 2019-10-21 19:06:18 UTC
+++ base/cpu.cc
-@@ -15,7 +15,7 @@
+@@ -14,7 +14,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
-@@ -97,7 +97,7 @@ uint64_t xgetbv(uint32_t xcr) {
+@@ -135,7 +135,7 @@ uint64_t xgetbv(uint32_t xcr) {
#endif // ARCH_CPU_X86_FAMILY
@@ -18,7 +18,7 @@
std::string* CpuInfoBrand() {
static std::string* brand = []() {
// This function finds the value from /proc/cpuinfo under the key "model
-@@ -127,7 +127,7 @@ std::string* CpuInfoBrand() {
+@@ -165,7 +165,7 @@ std::string* CpuInfoBrand() {
return brand;
}
#endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) ||
@@ -27,7 +27,7 @@
} // namespace
-@@ -252,7 +252,7 @@ void CPU::Initialize() {
+@@ -287,7 +287,7 @@ void CPU::Initialize() {
}
}
#elif defined(ARCH_CPU_ARM_FAMILY)