From nobody Sun Sep 04 12:19:47 2022 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 4ML9h35Rr3z4bX63; Sun, 4 Sep 2022 12:19:47 +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 4ML9h34xGFz3SRV; Sun, 4 Sep 2022 12:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662293987; 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=UydCI+v6ulwCWZk13vAowaNqxhinB0Dtn9dOQdNVqUw=; b=f2cXbG//AkB7sQ08eLEOQK59QuC1zVYjH7qmoPZ7mLe4ZE1BTyZ3ujD4kXvUDFWaNACE7R nHE+bHPEKQWFquBBCNrvGuUHYd4pzJW34Z/hQVwdvCxnFV3isZyqWYHLDMUJBVHKWSoSet 6hNtpg60q7pPxxLFUrTdOjfTotUnJUSckAbjJF7K0Aggw5lyMo41Jvc7yo2GTK9yqwsfZO l9P3tGq3jGNdU2fVzAo0E+I0LzmEop5txuIoVFqnPlD+rHHT4Z2xvgRGC2fTmqdsQPebUc 3LFsIHrTZ8+zYBemB9hENWkN9sqplwdOUWUBY4q+wZOnhxKTTgWJpiQValY10w== 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 4ML9h33xMwzV6l; Sun, 4 Sep 2022 12:19:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 284CJlM3011355; Sun, 4 Sep 2022 12:19:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 284CJlJD011354; Sun, 4 Sep 2022 12:19:47 GMT (envelope-from git) Date: Sun, 4 Sep 2022 12:19:47 GMT Message-Id: <202209041219.284CJlJD011354@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: e54df6f543aa - 2022Q3 - www/chromium: unbreak on arm64 by not using linux specific code 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: e54df6f543aa44403775cca7fa7b543b8c6f7517 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662293987; 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=UydCI+v6ulwCWZk13vAowaNqxhinB0Dtn9dOQdNVqUw=; b=pOXG13IIDL6m4LG1W5pSdoDSV10BZzo/uibfoC+XDTHX+7qidoafETziv+36yppNLw1jrv 7gzRLOyzn4THk6IirNpjgT82/Op5MUMP4VHBYbqG9BIFu7PwbPmqQcNiF8Z4A317bft3u3 PSKjUCujA8zGWHLoWzIgy5jIlP2indRqZg9o4o+v1nY2EJdrS8avqsn9m4RY0sDbweTHgE zZ/74IHz3JZLcZaS+6MXIRMsogo4+Ys5OHkeC28FnnprCk2MrDr4yiapQ8YI23pzmzPbqH Hs1i3waq+L05NZJZ481z8JbZjXqd/YTlaGm4HpPdF8Sm23os2dtc8GhF2xvzNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662293987; a=rsa-sha256; cv=none; b=JpY2fTax4d4Wz0ehFLi5jtxq4PGz03/QtwdOInYEgKbra7Dmy7uMEpbSZ4yGCQ0TXTIYot /xCyoS5Xjj81SvqEK0nu+BUjTeqnhRL4Amz9+qxDMedoF5jl78XpHye1vuKR0tuAQSuwC4 A7xgCm+JsFh+if971rR+fDiysYa1QTnyH4GdcjUZINOw/po7u0MRjbD3waHUyahpFDBjNH SYGXkrlBQIbRkDyvRLVXtz0lWsftsFObemaTEnehyehZ3NqvURMPPJ4eoEUCshYkNzjtLc z7Y2pKiiaCzzPgpMAoRLiw2fXxjQaQm3kb8Jig/Kv9vSfRWJDDIIbKCqykZy6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=e54df6f543aa44403775cca7fa7b543b8c6f7517 commit e54df6f543aa44403775cca7fa7b543b8c6f7517 Author: Robert Nagy AuthorDate: 2022-09-04 11:58:11 +0000 Commit: Rene Ladan CommitDate: 2022-09-04 12:19:36 +0000 www/chromium: unbreak on arm64 by not using linux specific code (cherry picked from commit 88b6e6aa0e0b975f15090950736b9a6a9cb5e58d) --- .../files/patch-third__party_lzma__sdk_C_CpuArch.c | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c new file mode 100644 index 000000000000..e5faa231f03f --- /dev/null +++ b/www/chromium/files/patch-third__party_lzma__sdk_C_CpuArch.c @@ -0,0 +1,44 @@ +--- third_party/lzma_sdk/C/CpuArch.c.orig 2022-09-04 11:56:14 UTC ++++ third_party/lzma_sdk/C/CpuArch.c +@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP + BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; } + BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; } + ++#elif defined(__OpenBSD__) + ++#include ++#include ++#include ++#include ++ ++BoolInt CPU_IsSupported_NEON() { return 1; } ++ ++#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ ++ BoolInt CPU_IsSupported_ ## name1() { \ ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; \ ++ size_t len = sizeof(uint64_t); \ ++ uint64_t cpu_id = 0; \ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) \ ++ return 0; \ ++ if (ID_AA64ISAR0_ ## name2(cpu_id) >= ID_AA64ISAR0_## name2 ##_BASE) \ ++ return 1; \ ++ return 0; \ ++ } ++ ++#define MY_HWCAP_CHECK_FUNC(name) \ ++ MY_HWCAP_CHECK_FUNC_2(name, name) ++ ++MY_HWCAP_CHECK_FUNC (CRC32) ++MY_HWCAP_CHECK_FUNC (SHA1) ++MY_HWCAP_CHECK_FUNC (SHA2) ++MY_HWCAP_CHECK_FUNC (AES) ++ + #else // __APPLE__ + + #include + +-#if !defined(ARMV8_OS_FUCHSIA) ++#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) + #define USE_HWCAP + #endif // !defined(ARMV8_OS_FUCHSIA) +