diff options
Diffstat (limited to 'www/chromium/files/patch-base_cpu.cc')
| -rw-r--r-- | www/chromium/files/patch-base_cpu.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index 747ffeeecfa4..c1e85a57c187 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,4 +1,4 @@ ---- base/cpu.cc.orig 2021-01-18 21:28:44 UTC +--- base/cpu.cc.orig 2021-03-12 23:57:15 UTC +++ base/cpu.cc @@ -16,7 +16,7 @@ @@ -9,9 +9,9 @@ defined(OS_AIX) #include "base/containers/flat_set.h" #include "base/files/file_util.h" -@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() { +@@ -212,6 +212,14 @@ const ProcCpuInfo& ParseProcCpu() { - return brand; + return *info; } +#elif defined(OS_BSD) +std::string* CpuInfoBrand() { @@ -24,12 +24,12 @@ #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -305,7 +313,7 @@ void CPU::Initialize() { - } - } - #elif defined(ARCH_CPU_ARM_FAMILY) --#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) -+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - cpu_brand_ = *CpuInfoBrand(); +@@ -348,6 +356,8 @@ void CPU::Initialize() { + has_bti_ = hwcap2 & HWCAP2_BTI; + #endif + ++#elif defined(OS_BSD) ++ cpu_brand_ = *CpuInfoBrand(); #elif defined(OS_WIN) // Windows makes high-resolution thread timing information available in + // user-space. |