From nobody Wed Mar 06 06:06:55 2024 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqMQR6tVRz5BpmW; Wed, 6 Mar 2024 06:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqMQR6JLKz4W0B; Wed, 6 Mar 2024 06:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709705215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yHvPXT23lJySUHaZtyYuJh7AIAoqp3TVuixjKAbfrM=; b=x+JREV9VUhsBHqifEEd6V2taTATRGq8fnB1WE9FAAgU+WL4+9hwRMioGc4e9483RBVQ4iO Sc1Y5IJxggSZsF7qpE2ub10+1hS2UeOGvXrYR40XyPSPtX/SeoHC2sLInG+ucH7QkJZsEk h5uQ4LWmsTJ4Asfo6HKL6jsAUzp11AKVtQAXNzPm6yVEkuIj3a/2nWtUGwQXYdb6aAyWo6 CfgKEexcuyUWzy1HeFFjuCZKUuWp1nn3b5w/UKH2qHfklHVQ/QvhMBmwcIVpIWiMLHQJVL 4winjwLPFedV4j+teYH9iRVmUivwGdEVeeGazAjv4EwjZv1cLTxtDbXSDBnJWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709705215; a=rsa-sha256; cv=none; b=tKVo2suqCrrwnXn9BkPDSNTO79irQYGYbyfCWPWZFnfXJtgtO54ohGHPZh1jfYgG5apKVN 9mv/WfioFXKCn+ck3wDhjuLrlaEtKiKMsbF0vrghWoc/Hx0wOxhqvPOp6lMk1zpdEdAvvh 4EazuJRQhz6gJP0Exml1kmLC0ibu3nRNsM7SXPQT65RgEGq6fN4WBvF1JdS96ZKrDZet+t HPyqEWWMX1H4nivhNXSULX52MsPDvixRC+B5ZYYXG1e6eJrD/UHDldvC+GdA5bPYE8+wwu gBq+zqF6vZAw4ar+xWdJ8TC0O5tRBwRYgoM+UewdDkPD4Et/SqhRes1XGPJj2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709705215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/yHvPXT23lJySUHaZtyYuJh7AIAoqp3TVuixjKAbfrM=; b=tfSj4vSv7migUZRW1uQJVLfcOOr5CynCcvNOwO5/cbtjPNi82CMdiS1dlCejIb5UybQeKt gzHLbuGS+GYBR5LnGkeTaG0T7P10GlpF84Fcml/FbHeZ/cbPbLkCmZeGIJ7pCp+ryY9g1y ucvQQE6sIPgvA5Bot8a4C8ZY/2SuMVWcEMweZNen0OPnDL3dJj/zmvGyBWICKpmmUrEe6d p272vHYKRheHs/ud5r+/19eVFF/c1Cr2p+0tBH5dHYrYjBMoo01H6oiG5rxmk6fyq9477a 1Gt8e8OzAO0jUt0lFYSt2e1IENjpv4YeTLMvNE94u9oA3A1vLaogfDPnHB5EmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqMQR5bbkzdjS; Wed, 6 Mar 2024 06:06:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42666tKW075550; Wed, 6 Mar 2024 06:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42666tli075547; Wed, 6 Mar 2024 06:06:55 GMT (envelope-from git) Date: Wed, 6 Mar 2024 06:06:55 GMT Message-Id: <202403060606.42666tli075547@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Nagy Subject: git: 6af0d836c6b1 - 2024Q1 - www/*chromium: unbreak on arm64 by disabling linux only memory tagging List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rnagy X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: 6af0d836c6b1f8e34319d0b75d9d5190918219a8 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by rnagy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6af0d836c6b1f8e34319d0b75d9d5190918219a8 commit 6af0d836c6b1f8e34319d0b75d9d5190918219a8 Author: Robert Nagy AuthorDate: 2024-03-06 06:05:37 +0000 Commit: Robert Nagy 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.