Date: Wed, 6 Mar 2024 06:06:13 GMT From: Robert Nagy <rnagy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: ef70968307c6 - main - www/*chromium: unbreak on arm64 by disabling linux only memory tagging Message-ID: <202403060606.42666DsS075321@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=ef70968307c637c51aec1fe7e2eda20658dac631 commit ef70968307c637c51aec1fe7e2eda20658dac631 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:07 +0000 www/*chromium: unbreak on arm64 by disabling linux only memory tagging --- ...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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403060606.42666DsS075321>