Commit d0c35f41 authored by Timothy Pearson's avatar Timothy Pearson
Browse files

Fix unlogged assert on startup

parent 2713e549
--- a/base/system/sys_info.cc
+++ b/base/system/sys_info.cc
@@ -255,6 +255,8 @@
return "ARM";
#elif defined(ARCH_CPU_ARM64)
return "ARM_64";
+#elif defined(ARCH_CPU_PPC64)
+ return "PPC_64";
#elif defined(ARCH_CPU_RISCV64)
return "RISCV_64";
#else
--- a/components/variations/proto/study.proto
+++ b/components/variations/proto/study.proto
@@ -264,6 +264,9 @@
// A Mac-only value, indicating an x86-64 binary running on an arm64 host
// via "Rosetta 2" binary translation.
TRANSLATED_X86_64 = 4;
+
+ // A POSIX-only value, indicating an OpenPOWER host
+ PPC64 = 5;
}
// Enum to pass as optional bool.
--- a/components/variations/service/variations_field_trial_creator_base.cc
+++ b/components/variations/service/variations_field_trial_creator_base.cc
@@ -109,6 +109,9 @@
if (process_arch == "x86") {
return Study::X86_32;
}
+ if (process_arch == "PPC_64") {
+ return Study::PPC64;
+ }
if (process_arch == "x86_64") {
std::string os_arch = base::SysInfo::OperatingSystemArchitecture();
if (base::StartsWith(os_arch, "arm",
# POWER support
ppc64le/core/add-ppc64-architecture-string.patch
ppc64le/sandbox/0001-linux-seccomp-bpf-ppc64-glibc-workaround-in-SIGSYS-h.patch
ppc64le/sandbox/0001-sandbox-Enable-seccomp_bpf-for-ppc64.patch
ppc64le/sandbox/0001-services-service_manager-sandbox-linux-Fix-TCGETS-de.patch
......@@ -54,6 +56,7 @@ ppc64le/fixes/fix-rustc.patch
ppc64le/fixes/fix-rust-linking.patch
ppc64le/fixes/fix-breakpad-compile.patch
ppc64le/fixes/fix-partition-alloc-compile.patch
ppc64le/fixes/fix-study-crash.patch
ppc64le/v8/0002-Add-ppc64-trap-instructions.patch
ppc64le/sandbox/fix-ppc64-linux-syscalls-headers.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment