summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-base_cpu.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
committerRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
commit651302b592fe54c5197641402df87ff216c27903 (patch)
tree784a10fc6050d3be8786fd6f4f954d7802bd9204 /www/iridium/files/patch-base_cpu.cc
parentAdd compiler:c++14-lang to USES to atttempt to fix on GCC-based systems: (diff)
www/iridium: update to 2020.04.81
PR: 245959 Submitted by: Matthias Wolf MFH: 2020Q3 Security: any Chromium vulnerability between 73 and 81
Notes
Notes: svn path=/head/; revision=542938
Diffstat (limited to 'www/iridium/files/patch-base_cpu.cc')
-rw-r--r--www/iridium/files/patch-base_cpu.cc38
1 files changed, 38 insertions, 0 deletions
diff --git a/www/iridium/files/patch-base_cpu.cc b/www/iridium/files/patch-base_cpu.cc
new file mode 100644
index 000000000000..231561a3a542
--- /dev/null
+++ b/www/iridium/files/patch-base_cpu.cc
@@ -0,0 +1,38 @@
+--- base/cpu.cc.orig 2019-10-21 19:06:18 UTC
++++ base/cpu.cc
+@@ -14,7 +14,7 @@
+
+ #include "base/stl_util.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
+
+@@ -135,7 +135,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
+@@ -165,7 +165,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
+
+@@ -287,7 +287,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