From nobody Wed Sep 21 07:47:27 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 4MXVr01PZPz4cdBj; Wed, 21 Sep 2022 07:47:28 +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 4MXVr00q6Zz3Pgd; Wed, 21 Sep 2022 07:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663746448; 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=cXdSNlLHbmcXE0XFFERc3QAhxUyUWNcBPwNTRJ7+zCM=; b=XVrJqhGv7L3Rps2VCeQR7CCkry0iXr+VERZ9C+c5RCwxCCT6pcqtQB2NSIu8YaQR311Hgo avKcGKH36vTa9LEhVbI2J6DTjQhmD7gnUIe7jy+iOU+vwiGWhhg7I4r7EJ4C/tKbR4UHCN zcE1kIF/Bpg1DL/mA5edkvnPmiaCj/08F/1eV1pON9SXdo2kRKAI0YeY2QaXoy4rAEEaS8 n2D8x8XorXvxreDzEEjsJm8QO0x24vP4/ww9um2kSr/lGGAxrE+RBd5/pc6oSBa30+NqcO 7jTBC3dNgyGtHCe7G2QPJcGAGXzoRwOQmvJvn0VjpWrUYnJZWYgDxkZkADgJDw== 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 4MXVqz6xDTz10cS; Wed, 21 Sep 2022 07:47:27 +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 28L7lRXW027084; Wed, 21 Sep 2022 07:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28L7lRK2027083; Wed, 21 Sep 2022 07:47:27 GMT (envelope-from git) Date: Wed, 21 Sep 2022 07:47:27 GMT Message-Id: <202209210747.28L7lRK2027083@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: 1fd63cc34aa0 - main - sysutils/UEFITool: fix build on aarch64 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: 1fd63cc34aa0fe50ce88d514b051e250d2a65e01 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663746448; 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=cXdSNlLHbmcXE0XFFERc3QAhxUyUWNcBPwNTRJ7+zCM=; b=iS85SdvfdFL7Afy3nEzX85k0iYZSnwixsP+bLAZeaS7S1K9Fjx+QjPoV5z4ZSwVPiDPIPk tSVg1dGd678Y3xcytps1eEFn56Khb8jRwK1tByQqP+87lOERIqCztq+erx3Dcks1tn4zFZ XZylvaOoS76zhwqBoZftDOR02tFAJs+44U3x7lgZXUV//mWCIAuiMRRGMDZjVZTlyt62VN jYnrzQ2VgNpUa/saIgxZ9azes9gTlj0K+AicY9s+qEibPI/hAoEqDk1K0b7gjDUOf11Evs I72Zw962j7tRbhLC+Z8ghn82aVP3cHmnIo56gr6I+Tf9KqHA1DddWIPuwySTAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663746448; a=rsa-sha256; cv=none; b=JywXh1rtzz9TyusJJg5tMe8eO2W0nDTgI44a01CDKUH1RS05mHqa8PqI2VoP+4jsQwe3R+ zecLpNJqoGhd9+andqRCeY9HDYBwSkwk6g2kD+Lzeb1roFe7i89Vt+x8m4gVKFHH8pbsO5 Bovq7s1hJqopwCyvgnVrZBf9VTdqPVy8m8190kn6MA6qpaotVDf5HtIh9q5zfsbnrKQa3q tPiOtpfmrzD/3eUlbnFiOxdskW+SqiL6zpcexS8O1ZKMn6ilve5UlyvzF32wEj+Imwjbr+ oHSW1YjGn9VJcJatxG/YfF4RMW/zdOy8yrpwl1DokZUPQI3WP9nbYYtKOCCNyA== 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=1fd63cc34aa0fe50ce88d514b051e250d2a65e01 commit 1fd63cc34aa0fe50ce88d514b051e250d2a65e01 Author: Piotr Kubaj AuthorDate: 2022-09-21 07:42:30 +0000 Commit: Piotr Kubaj CommitDate: 2022-09-21 07:42:30 +0000 sysutils/UEFITool: fix build on aarch64 --- .../UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c | 20 ++++++++++++++++++++ 1 file changed, 20 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 new file mode 100644 index 000000000000..64f8b1013f75 --- /dev/null +++ b/sysutils/UEFITool/files/patch-common_LZMA_SDK_C_CpuArch.c @@ -0,0 +1,20 @@ +--- ../common/LZMA/SDK/C/CpuArch.c.orig 2022-09-10 16:08:06.000000000 +0200 ++++ ../common/LZMA/SDK/C/CpuArch.c 2022-09-21 09:40:04.461577000 +0200 +@@ -421,10 +421,17 @@ + + #ifdef USE_HWCAP + ++#ifdef __linux__ + #include ++#endif + ++#ifdef __linux__ + #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ + BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; } ++#elif defined(__FreeBSD__) ++ #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ ++ BoolInt CPU_IsSupported_ ## name1() { uint32_t hwcaps = 0; elf_aux_info(AT_HWCAP, &hwcaps, sizeof(hwcaps)); return (hwcaps & (HWCAP_ ## name2)) ? 1 : 0; } ++#endif + + #ifdef MY_CPU_ARM64 + #define MY_HWCAP_CHECK_FUNC(name) \