diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index 7ace56892161..284403a45df8 100644 --- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,11 +1,20 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-02-23 21:04:38 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-06 06:05:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni +@@ -30,7 +30,7 @@ if (is_nacl) { + } + + has_memory_tagging = +- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) ++ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) + + declare_args() { + # Causes all the allocations to be routed via allocator_shim.cc. Usually, @@ -335,7 +335,7 @@ declare_args() { # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. enable_pkeys = - (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build + !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build } assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), "Pkeys are only supported on x64 linux and ChromeOS") diff --git a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni index c65c98267491..284403a45df8 100644 --- a/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni +++ b/www/ungoogled-chromium/files/patch-base_allocator_partition__allocator_partition__alloc.gni @@ -1,11 +1,20 @@ ---- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-02-25 20:22:18 UTC +--- base/allocator/partition_allocator/partition_alloc.gni.orig 2024-03-06 06:05:23 UTC +++ base/allocator/partition_allocator/partition_alloc.gni +@@ -30,7 +30,7 @@ if (is_nacl) { + } + + has_memory_tagging = +- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android) ++ current_cpu == "arm64" && is_clang && !is_asan && !is_bsd && (is_linux || is_android) + + declare_args() { + # Causes all the allocations to be routed via allocator_shim.cc. Usually, @@ -335,7 +335,7 @@ declare_args() { # dependencies that use partition_allocator are compiled in AOSP against a # version of glibc that does not include pkeys syscall numbers. enable_pkeys = - (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build + !is_bsd && (is_linux || is_chromeos) && target_cpu == "x64" && !is_cronet_build } assert(!enable_pkeys || ((is_linux || is_chromeos) && target_cpu == "x64"), "Pkeys are only supported on x64 linux and ChromeOS")