www/*chromium: unbreak on arm64 by disabling linux only memory tagging

(cherry picked from commit ef70968)
freebsd · Mar 6, 2024 · 6af0d83 · 6af0d83
1 parent 97361c4
commit 6af0d83
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
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
@@ -1,5 +1,14 @@
---- 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.

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
@@ -1,5 +1,14 @@
---- 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.