From nobody Wed Apr 24 21:21:40 2024 X-Original-To: dev-commits-ports-all@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 4VPsPJ4kKdz5J7P3; Wed, 24 Apr 2024 21:21:40 +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 4VPsPJ4FCnz4Qmr; Wed, 24 Apr 2024 21:21:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713993700; 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=r3QAnW9w1DZuobegQx6nO03RQzsKyN+QGhwiWj3Fe68=; b=Y4XQT3iI8+YlgSsj2DrfsbM/BM+b5y4xDkfAL0P+FRsGzUTIUSdd4IEg5Ty68u5489Ce9+ CdsgI83Rg5gmPxIW116yt/JfPw3U0z2DSpFT7bDw2M562M7lg47XNeLjXC7/G25p2ghbe0 WmvKMGx1Ynwi0oWW/UPWXVqnqJA4Bib75eDnSk/Y1vCUH/rDaZa90NOCJieaEJ/RwDXt7d 6Xp8WJFgtE64MhIUezdaixS5ZLGPUGYF79Fn/Wby3lvAqLL+P+kGLXsgzgZrZOkEviCrhD 2r9tQ41zDGMFsCTvWXo9+uIilIqZIfS14po9ok8FtBJMstWvObZnbqKyYsM2gQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713993700; a=rsa-sha256; cv=none; b=UzlCMQ93+PZ8PML/Eeq8e1x1V0i8Y5+rU32ej+a16hqO0FliCCbHycSA9qVrNN+SlzUcKI ReDNDDqcOsgXllpKXQFxyp3niIds6k+EQSDEcDMBYTv/nHYeqiCskL7PAPVNKxgIfrIB3p qfPCjZm55bSxdwc4ysmIdTc+geU0wlLieOU8kgsH6UlLLclJk5CAgfY1YosoAsXc9nWcTA QUbMCs/2oRvdfiG6HvjXbNJE/4c1r+btTRGKsl3Nh2g07yzRnUJkAf5FcITV/zHZtre7/C dPNlmQ+smUc8qMZdKscU0JZX7oaMH10SfFyhgHE2sHG7upMHBovPLUa7ZJNqUw== 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=1713993700; 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=r3QAnW9w1DZuobegQx6nO03RQzsKyN+QGhwiWj3Fe68=; b=nNvOmilZySO/0LnCwgx5dPjHbEIY1O8RMxHoryW+CoiIVcMQ8MKi6miMUHJKYoTgQeI1hJ sPT0bFgaYVZ/1dvm8Suy2dJ/HKA9lw75rVqubGQXbqAxXWUrhmtFPtorI+F8DSe+58mtEF y++ZtYHwc/JkLT+Wx6Clz+++dpMhgL4tKrTUA9mMo0qFjwRWShe8VqzeXp+00iEe+AqbP1 5DSowuXDUL+OdoSQbP/CgydGZOQyf+KPvq+fkZShzIxk9jEDS/EyT94o0PP4Si546Cvqua hBHoEXBjSVbKNTZ0S4MNhdUQ7Cc779DhyGMThvVnY1ZCp9lG8QMj8pILCv+KEw== 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 4VPsPJ3ryzzXb6; Wed, 24 Apr 2024 21:21:40 +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 43OLLeFk080636; Wed, 24 Apr 2024 21:21:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OLLelw080633; Wed, 24 Apr 2024 21:21:40 GMT (envelope-from git) Date: Wed, 24 Apr 2024 21:21:40 GMT Message-Id: <202404242121.43OLLelw080633@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: abf68fe4a24c - main - emulators/qemu-devel: fix build on powerpc64* with a patch from emulators/qemu List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: abf68fe4a24c88a8bece6e40c25bae7925ca3e7d Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=abf68fe4a24c88a8bece6e40c25bae7925ca3e7d commit abf68fe4a24c88a8bece6e40c25bae7925ca3e7d Author: Piotr Kubaj AuthorDate: 2024-04-18 08:58:22 +0000 Commit: Piotr Kubaj CommitDate: 2024-04-24 21:21:05 +0000 emulators/qemu-devel: fix build on powerpc64* with a patch from emulators/qemu --- .../qemu-devel/files/patch-util_cpuinfo-ppc.c | 27 ++++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c index ae39b6c3f4ae..af9999a22108 100644 --- a/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c +++ b/emulators/qemu-devel/files/patch-util_cpuinfo-ppc.c @@ -1,21 +1,34 @@ ---- util/cpuinfo-ppc.c.orig 2024-01-26 18:16:35 UTC +--- 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" -#include #ifdef CONFIG_GETAUXVAL # include + #else +# ifdef __linux__ +# include ++# elif defined(__FreeBSD__) ++# include +# endif - #else # 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; + } + }