Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_base_cpu.cc
| --- src/3rdparty/chromium/base/cpu.cc.orig 2019-11-27 21:12:25 UTC | --- src/3rdparty/chromium/base/cpu.cc.orig 2021-12-15 16:12:54 UTC | ||||
| +++ src/3rdparty/chromium/base/cpu.cc | +++ src/3rdparty/chromium/base/cpu.cc | ||||
| @@ -15,7 +15,7 @@ | @@ -16,7 +16,7 @@ | ||||
| #include "base/stl_util.h" | #include "base/stl_util.h" | ||||
| #include "build/build_config.h" | |||||
| -#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) | -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || \ | ||||
| +#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) || defined(OS_BSD) || \ | ||||
| defined(OS_AIX) | |||||
| #include "base/containers/flat_set.h" | |||||
| #include "base/files/file_util.h" | #include "base/files/file_util.h" | ||||
| @@ -31,7 +31,7 @@ | |||||
| #endif | #endif | ||||
| @@ -98,7 +98,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 | |||||
| @@ -128,7 +128,7 @@ std::string* CpuInfoBrand() { | |||||
| return brand; | 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) || | #endif // defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || | ||||
| - // defined(OS_LINUX)) | // defined(OS_LINUX) || defined(OS_CHROMEOS)) | ||||
| + // defined(OS_LINUX) || defined(OS_BSD)) | |||||
| } // namespace | @@ -305,7 +313,7 @@ void CPU::Initialize() { | ||||
| @@ -252,7 +252,7 @@ void CPU::Initialize() { | |||||
| } | } | ||||
| } | } | ||||
| #elif defined(ARCH_CPU_ARM_FAMILY) | #elif defined(ARCH_CPU_ARM_FAMILY) | ||||
| -#if (defined(OS_ANDROID) || defined(OS_LINUX)) | -#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) | ||||
| +#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) | +#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) | ||||
| cpu_brand_ = *CpuInfoBrand(); | cpu_brand_ = *CpuInfoBrand(); | ||||
| #elif defined(OS_WIN) | #elif defined(OS_WIN) | ||||
| // Windows makes high-resolution thread timing information available in | // Windows makes high-resolution thread timing information available in | ||||