diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
| commit | a0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch) | |
| tree | 0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-base_cpu.cc | |
| parent | games/iqpuzzle: Update 1.2.0 -> 1.2.1 (diff) | |
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene
Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
Notes
Notes:
svn path=/head/; revision=556709
Diffstat (limited to 'www/chromium/files/patch-base_cpu.cc')
| -rw-r--r-- | www/chromium/files/patch-base_cpu.cc | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/www/chromium/files/patch-base_cpu.cc b/www/chromium/files/patch-base_cpu.cc index ac9765934a12..f07b964997d3 100644 --- a/www/chromium/files/patch-base_cpu.cc +++ b/www/chromium/files/patch-base_cpu.cc @@ -1,38 +1,44 @@ ---- base/cpu.cc.orig 2020-07-07 21:57:30 UTC +--- base/cpu.cc.orig 2020-11-13 06:36:34 UTC +++ base/cpu.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,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)) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) || \ + defined(OS_AIX) + #include "base/containers/flat_set.h" #include "base/files/file_util.h" +@@ -31,7 +31,7 @@ #endif -@@ -136,7 +136,7 @@ uint64_t xgetbv(uint32_t xcr) { + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) + #include "base/files/file_util.h" + #endif - #endif // ARCH_CPU_X86_FAMILY +@@ -182,6 +182,14 @@ std::string* CpuInfoBrand() { --#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 -@@ -166,7 +166,7 @@ std::string* CpuInfoBrand() { return brand; } ++#elif defined(OS_BSD) ++std::string* CpuInfoBrand() { ++ static std::string* brand = []() { ++ return new std::string(SysInfo::CPUModelName()); ++ }(); ++ ++ return brand; ++} #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || -- // defined(OS_LINUX)) -+ // defined(OS_LINUX) || defined(OS_BSD)) - - } // namespace + // defined(OS_LINUX) || defined(OS_CHROMEOS)) -@@ -288,7 +288,7 @@ void CPU::Initialize() { +@@ -305,7 +313,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)) +-#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(); #elif defined(OS_WIN) // Windows makes high-resolution thread timing information available in |