From nobody Tue Aug 29 15:00:33 2023 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 4RZrFt1pyrz4rsrW; Tue, 29 Aug 2023 15:00:34 +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 4RZrFt0yD5z3VNZ; Tue, 29 Aug 2023 15:00:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693321234; 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=SUlnuZMm1vKhDX2FU6+wm5KzL3m9ITqvfE4cQ8WggtI=; b=LVD1daYf4Nhp26nQMxicEHGeWRTuy/Ycy4zaxjFVac6ys/Sbr4/XWKUJ2atfe3JYyOHE/+ 1ZYjYxvVb6GRB66MlcdkIiWwfy4sSgtGGkmMnJROAlTGasFd676devS3pejvXCCi/NndQC riX8XnktFRD5BthD7ZAD8StvujBny2C1UwpUK9HJwpYEQO8xjsDhmlEHVgOtxPxiHVw16u OVYUMfQddsxP+msj2y3oQhg1H6xgIK4Pd7w0F8GYigG3x6QOnL6ycFmFxc4gRPw4/duGJP Qr5HSjxEVMt5rBjsFvzp2YmDgEST5J++obERSupf+sC+vcu4V6uI+Kirm4zi9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693321234; a=rsa-sha256; cv=none; b=D06LDtufh+pC/bBNvB+rl0rL6oJtiwKngFx53VMfPPECjPhTAt0bfkl9GJNbbCANtcyMuM 0ytr0kYype2/aZAPxqx3Xrj25LGlb9uhsK8bNMwVglKk8Kmc7cIZdBUUk8VNU+DHvj3/rU WWryjBs3SWqr9TgBKLBtQdd1cQH7FZWtvW3kDAY/57e1tGORuQrG+Amv7uMeJS1udiqlHt sGGO4QFWPHhXYeXicQ8guYNNhwekdcpao3a1ZQ0tTCZEaNkZIKFXjqOqpIBPbFBNbuMr7C fur49mTrQ2Z9elsrstslhqZbBivpyARSFrHOHCaoU6YMDCCzPLm4iS0Q1W0xKg== 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=1693321234; 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=SUlnuZMm1vKhDX2FU6+wm5KzL3m9ITqvfE4cQ8WggtI=; b=b4RWryPiTqKzyfEj1aOfBSgCBXkEIVE2x2OuPfsFcQSANaz3MdrDXkKQeocXJRlmkNR2ia O4Oua3/pgJWqrnujRjdCgXhGZOD/WbtSvGnNvjngOY86YMUJECTQWzBQYopUNX1WWKdzPG xEC7jnesFJpwhvi0SJG0o6JAbB/Y85oeAuYP12hzJYa3FxVNLyhe7sIlHbWGbdkndWTyFu Rv8aNRosORrIcvhl3wA2JgI7cNjVukNNx65kfnkl2lFvLzkcFLgGdhXe/UHPtC5q3Kxevw ZTetSWjkoHI+sCyrgC/2dKHIaKfgDT44ULVpFvykm8OzbztGHhHbs9nS7qKhuQ== 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 4RZrFt013LzwDp; Tue, 29 Aug 2023 15:00:34 +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 37TF0X0o017431; Tue, 29 Aug 2023 15:00:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37TF0XfF017428; Tue, 29 Aug 2023 15:00:33 GMT (envelope-from git) Date: Tue, 29 Aug 2023 15:00:33 GMT Message-Id: <202308291500.37TF0XfF017428@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: b8870b3dda5b - main - emulators/qemu: fix build on powerpc64* 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: b8870b3dda5b5dd618254ea7a7644072568b612a Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=b8870b3dda5b5dd618254ea7a7644072568b612a commit b8870b3dda5b5dd618254ea7a7644072568b612a Author: Piotr Kubaj AuthorDate: 2023-08-29 14:25:24 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-29 14:25:24 +0000 emulators/qemu: fix build on powerpc64* 1. asm/cputable.h is Linux-only. 2. FreeBSD doesn't yet officially support POWER10, so we don't define PPC_FEATURE2_ARCH_3_1. --- emulators/qemu/files/patch-util_cpuinfo-ppc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/emulators/qemu/files/patch-util_cpuinfo-ppc.c b/emulators/qemu/files/patch-util_cpuinfo-ppc.c new file mode 100644 index 000000000000..499de6e86db0 --- /dev/null +++ b/emulators/qemu/files/patch-util_cpuinfo-ppc.c @@ -0,0 +1,18 @@ +--- util/cpuinfo-ppc.c.orig 2023-08-29 11:28:39 UTC ++++ util/cpuinfo-ppc.c +@@ -9,8 +9,14 @@ + #ifdef CONFIG_GETAUXVAL + # include + #else +-# include ++# ifdef __linux__ ++# include ++# endif + # include "elf.h" ++#endif ++ ++#ifndef PPC_FEATURE2_ARCH_3_1 ++# define PPC_FEATURE2_ARCH_3_1 0x00040000 + #endif + + unsigned cpuinfo;