From nobody Sun Feb 11 11:50:04 2024 X-Original-To: dev-commits-ports-main@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 4TXm9V2D11z59Z8K; Sun, 11 Feb 2024 11:50:06 +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 4TXm9S5rydz46Sf; Sun, 11 Feb 2024 11:50:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707652204; 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=ckMYGDC0lCQFVZqQtSEk+d4WxzqTHA9ervtvsvw8BwI=; b=RC08Qua8Y/8tQHupqwqD3Hdg4MAMRym5QLKPtHATC7QptLTcI0IhHV1n/mT/ZPLCGHn3rf +/EH83Ir7BHmwdtqUS+0xJ1y3OZcqkyQ1TI8iI9hYwTx2zgcXx5pXLdwC5IPcoqXoJj7b0 U/FOBOLEizEfqhlleQaPPREDcEuNDaU7vzgOoQneoPoxrv26Uuj7D7tx0/zh9Utc65cZ58 GlxzUX9sSGSjv7SrmODUVIJ2ib5S8L+G+rZYbt0rQU5ljcfvE0NQKYj33yNpS1XpEuCAGw NBJzs4jSsBdSvB9bMCGwivKrU1AtnLkoGjPqHDlM5VQfebllP2yf2JabPkof0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707652204; a=rsa-sha256; cv=none; b=xnxSCKKqkC+ketBYhiRlIKFfgYjOAcPucbwgIopOuKmgICJ4v0gV5gVzJ4tlatocfzqko1 eAZ+x3Jnl3b9JquNPDzBkrVIXDG7L1rqVsAGpKN872oBybjzRWwv2gvj5NIJQOC5+Oqi/U JiI+rnaNjKUFiEoUWEtGs6mPaLGDvVgHUTlC6X1qVE+MSKMzXDuN28IJHZgbim189fJLcy 1AtJgWal2A80yXZxUmQaDFPOjo1/d/qtClIUA/NcNmnFgFn/8S5Iv21ZnfdxGosIa3+pcc +/8v9pZalcN/HMQL2xsPHm7+Y8Cos729i0dc5pbCsvp4ThmsQBIbovC+jJwv+w== 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=1707652204; 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=ckMYGDC0lCQFVZqQtSEk+d4WxzqTHA9ervtvsvw8BwI=; b=kROaAdW6gdgUJWle1p4lj7N4gfBjoSNjUTmI63eqK/pgaFHRaiXKXfboVgoHOTjhsvEh8y wqy1EoPWkwIoNad+MN8NIOAq08P+WPGRYoDJsto7XpJkosBzBHtosP1M/+6ZfDkm6cauF2 z6JfRy2V7jIMeU2xcqLYsmd4Hej1undWMoxxt9pArfGm+c0KcYJcjdQQ7jIV8qwQ45LMW5 1l7e7BoJ4ro9VtnST1UeFpA6aPgmHsvvz/EP7uIF3giGBlL8WY/HmhJOFY635F0eNJ2OAZ +pm6tABCmxM2NQFKw62IzCBtqkV1Z/bNJk3wFqEAFMkm68qYJyfOTeS1ZIGdQw== 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 4TXm9S4yRtzxpB; Sun, 11 Feb 2024 11:50:04 +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 41BBo48K088683; Sun, 11 Feb 2024 11:50:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41BBo4dM088678; Sun, 11 Feb 2024 11:50:04 GMT (envelope-from git) Date: Sun, 11 Feb 2024 11:50:04 GMT Message-Id: <202402111150.41BBo4dM088678@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 872d8988c1c1 - main - emulators/qemu: fix build on powerpc* List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 872d8988c1c16aab3d7702b8079e630321b06b07 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=872d8988c1c16aab3d7702b8079e630321b06b07 commit 872d8988c1c16aab3d7702b8079e630321b06b07 Author: Piotr Kubaj AuthorDate: 2024-02-09 22:12:56 +0000 Commit: Piotr Kubaj CommitDate: 2024-02-11 11:49:02 +0000 emulators/qemu: fix build on powerpc* ../util/cpuinfo-ppc.c:49:18: error: use of undeclared identifier 'PPC_FEATURE2_ISEL' if (hwcap2 & PPC_FEATURE2_ISEL) { ^ ../util/cpuinfo-ppc.c:62:26: error: use of undeclared identifier 'PPC_FEATURE2_VEC_CRYPTO' if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) { ^ 2 errors generated. --- emulators/qemu/files/patch-util_cpuinfo-ppc.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/emulators/qemu/files/patch-util_cpuinfo-ppc.c b/emulators/qemu/files/patch-util_cpuinfo-ppc.c index 1de34b02b063..af9999a22108 100644 --- a/emulators/qemu/files/patch-util_cpuinfo-ppc.c +++ b/emulators/qemu/files/patch-util_cpuinfo-ppc.c @@ -1,6 +1,6 @@ --- util/cpuinfo-ppc.c.orig 2024-01-29 19:13:22 UTC +++ util/cpuinfo-ppc.c -@@ -6,11 +6,17 @@ +@@ -6,13 +6,21 @@ #include "qemu/osdep.h" #include "host/cpuinfo.h" @@ -10,12 +10,25 @@ #else +# ifdef __linux__ +# include ++# elif defined(__FreeBSD__) ++# include +# endif # include "elf.h" -+#endif -+ -+#ifndef PPC_FEATURE2_ARCH_3_1 -+# define PPC_FEATURE2_ARCH_3_1 0x00040000 #endif ++#ifndef PPC_FEATURE2_ARCH_3_1 ++# define PPC_FEATURE2_ARCH_3_1 0x00040000 ++#endif ++ unsigned cpuinfo; + + /* Called both as constructor and (possibly) via other constructors. */ +@@ -53,7 +61,7 @@ unsigned __attribute__((constructor)) cpuinfo_init(voi + * always have both anyway, since VSX came with Power7 + * and crypto came with Power8. + */ +- if (hwcap2 & PPC_FEATURE2_VEC_CRYPTO) { ++ if (hwcap2 & PPC_FEATURE2_HAS_VEC_CRYPTO) { + info |= CPUINFO_CRYPTO; + } + }