From nobody Thu Jan 23 00:16:41 2025 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 4YdhMG05yHz5lJP1; Thu, 23 Jan 2025 00:16:42 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YdhMF62djz3mqp; Thu, 23 Jan 2025 00:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737591401; 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=SzVDjBfMiJJOY0MaJB2BgD1OcmVVLOMYehqwganOABY=; b=LPKg183lH9wowP+PXYEvq3riW6qHPjZ27VNP+iE34ugyK+2b4tzrgxEKfogheZr4ZNs4oQ jAkax9wHv4GWnaSTePRk55nFpzCsYK8LBzYIENx9tOV+G9EUJRwj20IhIb32e+qWyjcJzH xJrDCK6NYoZ3iGy6q3wxriAbTSjvAyZH2uAZYWzbhaNMcf8bpgw+R4zBpvXhmcphNQhQ5m JfU0g40vFWuCpIVBGqKKI826muHEVj9e2elG5QyIDT4qCV+coQQaoARLYkeDDsQccJPWOQ xCMt3RAClQ/VqtSJfObUGotdMrruwdlMvOY1vndWxzfGcH199dmPOW502x1JlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737591401; 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=SzVDjBfMiJJOY0MaJB2BgD1OcmVVLOMYehqwganOABY=; b=rssedJHVIBJENGCUkVlWvZF8/yXa7x9OZAEkQSMpTi4kO+ayiZdZ2caWK3jagtePKUb3+4 P7NEWdVAsriadzDKKY41Ki4GORwTWioZNu5OGGWkAUemrZ5HbjIAD+TzKZw8BEe3DwZew6 8kL+aTY1DMjpGvGvHhGsboqcPvjNWl15amqW1RMqUR8wjXIyLZhcKSCFnx+6LO3CGXqq8D TMsh9ptWfNVz9QUkR3WGDTVbAFu5alXXRpexkasy2Pd+PkAvhvbcFc48h2sdaAmyqUUx98 WBVhOLRa2XB94a8HCUC8Os/pqfhAFGZ1ehHqJoMV+BXlGHn9Ie20UoQUEGFcWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737591401; a=rsa-sha256; cv=none; b=KXR9qOuJZJbfatJiN//zkO3DK8DuBvKQeKRTMr3PWqXTnEahId9dbWKBLLkvL+9LVE+8PI gQiunH2IaRYdejUMIaSrGggGLLDYkFCSghmQyxlz3c3vWi51f/izJxunPnkwtDNxpzzIlr U2AkKuairaaUM3JVrGl/QFDlsYaX4MB4WPn3byrOptwMFBn0PI/mO4nHHEQJwnPL0PFwYH U+J0k9AxGzT5hlOQyPrdM1I9A/UU8cHDMDqJRS70xgmieVi+3kCFpbUWHlQFUnt3RKc42e YmYpXqTKbkwY3JWwMDQEk76RPgYxXRg1TxmeEvSpx1gWxpbLOyuHVpZV6+AzLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdhMF5QNFzSb; Thu, 23 Jan 2025 00:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50N0GfTb089955; Thu, 23 Jan 2025 00:16:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N0GfDc089952; Thu, 23 Jan 2025 00:16:41 GMT (envelope-from git) Date: Thu, 23 Jan 2025 00:16:41 GMT Message-Id: <202501230016.50N0GfDc089952@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3c65822aeba4 - 2025Q1 - emulators/rpcs3: unbreak aarch64 build after a036b104b872 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: 3c65822aeba4dc699395e7039abbb256e3da1385 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c65822aeba4dc699395e7039abbb256e3da1385 commit 3c65822aeba4dc699395e7039abbb256e3da1385 Author: Jan Beich AuthorDate: 2025-01-22 22:35:39 +0000 Commit: Jan Beich CommitDate: 2025-01-23 00:16:13 +0000 emulators/rpcs3: unbreak aarch64 build after a036b104b872 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c:262:28: error: use of undeclared identifier 'CPUID_AARCH64_FEAT_PMULL' if (features & CPUID_AARCH64_FEAT_PMULL) ^ Reported by: pkg-fallout (cherry picked from commit 91e4d1cd95968d2db3e84d73592e8e71a73b077a) --- emulators/rpcs3/files/patch-wolfssl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/emulators/rpcs3/files/patch-wolfssl b/emulators/rpcs3/files/patch-wolfssl new file mode 100644 index 000000000000..c736ccef7dc1 --- /dev/null +++ b/emulators/rpcs3/files/patch-wolfssl @@ -0,0 +1,16 @@ +https://github.com/wolfSSL/wolfssl/commit/197a7e0ba386 + +--- 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c.orig 2024-12-31 17:58:22 UTC ++++ 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c +@@ -259,8 +259,10 @@ + + if (features & CPUID_AARCH64_FEAT_AES) + cpuid_flags |= CPUID_AES; +- if (features & CPUID_AARCH64_FEAT_PMULL) ++ if (features & CPUID_AARCH64_FEAT_AES_PMULL) { ++ cpuid_flags |= CPUID_AES; + cpuid_flags |= CPUID_PMULL; ++ } + if (features & CPUID_AARCH64_FEAT_SHA256) + cpuid_flags |= CPUID_SHA256; + if (features & CPUID_AARCH64_FEAT_SHA256_512)