git: 6af0d836c6b1 - 2024Q1 - www/*chromium: unbreak on arm64 by disabling linux only memory tagging

From: Robert Nagy <rnagy_at_FreeBSD.org>
Date: Wed, 06 Mar 2024 06:06:55 UTC
The branch 2024Q1 has been updated by rnagy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6af0d836c6b1f8e34319d0b75d9d5190918219a8

commit 6af0d836c6b1f8e34319d0b75d9d5190918219a8
Author:     Robert Nagy <rnagy@FreeBSD.org>
AuthorDate: 2024-03-06 06:05:37 +0000
Commit:     Robert Nagy <rnagy@FreeBSD.org>
CommitDate: 2024-03-06 06:06:50 +0000

    www/*chromium: unbreak on arm64 by disabling linux only memory tagging
    
    (cherry picked from commit ef70968307c637c51aec1fe7e2eda20658dac631)
---
 ...h-base_allocator_partition__allocator_partition__alloc.gni | 11 ++++++++++-
 ...h-base_allocator_partition__allocator_partition__alloc.gni | 11 ++++++++++-
 2 files changed, 20 insertions(+), 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
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,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
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,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.