From nobody Thu Sep 29 14:30:39 2022 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 4MdbPX0fW5z4cykj; Thu, 29 Sep 2022 14:30: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 4MdbPX0Bnbz3qtY; Thu, 29 Sep 2022 14:30:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664461840; 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=kkNQmlm7/8O/E+o1VBLR/bi0hdjz45FF83gvu8OK82M=; b=dYCSpeQlLoS/ub3w7Wo7tIi04BU/c+5o/PMUSXxolvgyvFtdCmP8arYsVDigl2t6P3CF0p gN64PG6R9dwuvIsXVYc4ZgaHYH+n4SWtez+SeC8yDmdvXkUOKs+WgqhhMInhfWP5JEZIQX a9vcsQyYdmB9vzlRDExac8AEC8nggD375Zmpru0b4Ibxvf/gU/kDb5DbUMSZAqncN1KC4s HLZUjRPdGesXjdLFVrTNqLQIMoF31ofnNuXc3mUeUwBJOQ/GsUO8sbbP0U1TFDoBNCyi+o 13ZW9M2oZDRY4Jb8j3WYh9O0owK2Qt363irRBvDqj9KGvugm5VWydg4W4ZFKwQ== 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 4MdbPW6NMszr2x; Thu, 29 Sep 2022 14:30:39 +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 28TEUdri038274; Thu, 29 Sep 2022 14:30:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28TEUdYB038273; Thu, 29 Sep 2022 14:30:39 GMT (envelope-from git) Date: Thu, 29 Sep 2022 14:30:39 GMT Message-Id: <202209291430.28TEUdYB038273@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: 5bc83684d7f5 - main - sysutils/UEFITool: fix build on armv7 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: 5bc83684d7f5948cc6da500c015f9974313f2544 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664461840; 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=kkNQmlm7/8O/E+o1VBLR/bi0hdjz45FF83gvu8OK82M=; b=bmzaI+V8TrDbEP9XBCfGittWtZ9+Tyswv20O9B5qHFQz8Lttk6uEI6riBQsgCUCEfSo5BT PFPoxRcr4rMEuXxKlsA3yFvJNcDm7ZruCVc72x7kv+8I54XTXKBoIeANKaxR/A/9x3JtSZ kQY/jQcMTYuTKwPDaVspCxli21fXRyuFTnxF9aO5Fi9SqQbaRk2BIqpK0WdgC8ZPXL70Z5 ddxHDW7hgf4a3ZYi8YhmXPLq2liIGd5csj/pDxwcP5gb0eZuGdH7jlzoObi1KBaiDYpsWh bsdbbKCzjka2JlcUlS47TeoVMhSsN3/QmXTwVMhN9pmY2J3IqzjVX8NuHTGYYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664461840; a=rsa-sha256; cv=none; b=hTOkkeABVJUfY2BqRCg1P5PLBOFCwFbYmOtRyjy7x9fniUbvCdejjR2Me19Dgk1vNeRJOL BJ+5UxNB+x/irfnkvQBDn78y5JAKJrhPKG3nTw2PMMPR4O15f8YfGRqSX+R/HgQseiIeda 6TOpmhZ86vPi80qKsKqNLj337Qrnc+0M7UbFufqpb3gzmhs0JSU/VWv2lSaitAouebiJjK VH0OKCdiYK4j+fMAn62pcpYBUot3WBAjKL4L0qfmI4ANZ1DnYU0fYEJhsh2r17tbugBWX4 SxdCq7iEaNWZ0U03mry1u6+jdHBv9XlntvV8gg6VPaMBxxAv+c92hTzymZYzNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=5bc83684d7f5948cc6da500c015f9974313f2544 commit 5bc83684d7f5948cc6da500c015f9974313f2544 Author: Piotr Kubaj AuthorDate: 2022-09-29 14:30:00 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-29 14:30:35 +0000 sysutils/UEFITool: fix build on armv7 --- sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c b/sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c index 64f8b1013f75..bcf8542c49c4 100644 --- a/sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c +++ b/sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c @@ -18,3 +18,16 @@ #ifdef MY_CPU_ARM64 #define MY_HWCAP_CHECK_FUNC(name) \ +@@ -432,8 +439,13 @@ + MY_HWCAP_CHECK_FUNC_2(NEON, ASIMD) + // MY_HWCAP_CHECK_FUNC (ASIMD) + #elif defined(MY_CPU_ARM) ++#ifdef __linux__ + #define MY_HWCAP_CHECK_FUNC(name) \ + BoolInt CPU_IsSupported_ ## name() { return (getauxval(AT_HWCAP2) & (HWCAP2_ ## name)) ? 1 : 0; } ++#elif defined(__FreeBSD__) ++ #define MY_HWCAP_CHECK_FUNC(name) \ ++ BoolInt CPU_IsSupported_ ## name() { uint32_t hwcaps = 0; elf_aux_info(AT_HWCAP2, &hwcaps, sizeof(hwcaps)); return (hwcaps & (HWCAP2_ ## name)) ? 1 : 0; } ++#endif + MY_HWCAP_CHECK_FUNC_2(NEON, NEON) + #endif