From nobody Sat Apr 8 13:18:54 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 4Ptwmb0VZvz44RFL; Sat, 8 Apr 2023 13:18:55 +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 4PtwmZ6sPRz3mfj; Sat, 8 Apr 2023 13:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680959935; 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=0nrX8SeuAQN2orIJC00nw7o9ZbDSd9TOCfWrZUDKPpM=; b=FBx0v3OxoIfg0FtxAJ+g5KvrXhXWbYrwnmFQ/AsFyCIZBMe6oTRpsBm0jHO7hxmCEOVFi3 G80P78Qtq231gUi+VjMR7/y60IN5+Ec3Hc7Hk9jwADXE0bw4kKlxkB9xB/xuTZCIyrhkBo LzV14OxDbrePwh1BARlCH4Jo17LinFvKFblZPEkjOCQerXMG2Ra7Rhd4FXWi5GkAxmp+n3 NkMM7kA+V207CVPFyyp1iiZb4ckHfGYlNIrqGooP649g9znC4/YmwbGHgrIfoZY34N1l4F mUNC2KGhRfSvQD+8URtY4yiPAmmbiq0q73uFijygTZsaA8ivqjAM9kszflIiyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680959935; 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=0nrX8SeuAQN2orIJC00nw7o9ZbDSd9TOCfWrZUDKPpM=; b=VZktQBSxReF0i39Opdtf7oFPj4lehsFxgvutxxCEpig86Oe8jPlNSITkcs0WQC/4+cehzI TJs+/bq2RBkotA/61atTv+9EtnE0cR3D6BudxFxzEgz8kXrN/MK61fiz589p5Lzcz0uB6g 812H8TXZkzpK6dwG68wql3SJpeBzkDfXAzlCJkn5GYtKsTtSxwQXbj59AyLzpta7/cZp5X Bm/Kc3Lw27HGvnd27X2S/EzKGyN0P/+1qZi2t+GA+zlvZ8xCnvBMXzQHinVCIPDNa9M7m4 W5x8stxSqXoSUrBwMFY0qZWjub7K34rb2D5gVm2wjtCVitQzoRG5IIWSDghHfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680959935; a=rsa-sha256; cv=none; b=ByqyreW6kpK8D2WMBRBocCrr+R9dh3NBPOP1KM3F/EP06fGY7ws07b34TKDPi5/FnTQ6Xy QPnOFBEIgvS7648JK3bJ/hYPPpkK/HZUZpcrO9pQf2exno86XYDA1/it0T4RkgNpCg5Nty GfxJF018ZO48sVUGikvToM1kmgvMhWb8SHmAdw0POJpnYb98n9ROUraCJQu8BEy9E6YvZH MYgj+VjxDaQgqWGFV6kNryaRKAvIRM7gqYbGq2CZ70t8OKUNmvFYh2LA2AoTlV7v4SL5ie Z8MsrAIl+teAAcO92ZiMcKiSUUdUJLcAb2UwGfGpZZCisCog7lRmpBZOZ0hq4g== 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 4PtwmZ4Ys2zSx8; Sat, 8 Apr 2023 13:18:54 +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 338DIs2c074996; Sat, 8 Apr 2023 13:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 338DIsLf074995; Sat, 8 Apr 2023 13:18:54 GMT (envelope-from git) Date: Sat, 8 Apr 2023 13:18:54 GMT Message-Id: <202304081318.338DIsLf074995@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 09b3d995009c - main - misc/far2l: try harder to unbreak the 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: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09b3d995009c317088d49f974be740760e16075f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=09b3d995009c317088d49f974be740760e16075f commit 09b3d995009c317088d49f974be740760e16075f Author: Alexey Dokuchaev AuthorDate: 2023-04-08 13:17:54 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-04-08 13:17:54 +0000 misc/far2l: try harder to unbreak the build on AArch64 This should be part of the earlier commit 1f8d09172023. Reported by: pkg-fallout --- .../files/patch-multiarc_src_formats_7z_C_7zCrc.c | 11 +++++++++++ .../files/patch-multiarc_src_formats_7z_C_CpuArch.c | 19 +++++++++++++++++++ .../files/patch-multiarc_src_formats_7z_C_Sha1Opt.c | 12 ++++++++++++ .../files/patch-multiarc_src_formats_7z_C_Sha256Opt.c | 12 ++++++++++++ 4 files changed, 54 insertions(+) diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c new file mode 100644 index 000000000000..3badab66c6bb --- /dev/null +++ b/misc/far2l/files/patch-multiarc_src_formats_7z_C_7zCrc.c @@ -0,0 +1,11 @@ +--- multiarc/src/formats/7z/C/7zCrc.c.orig 2023-01-14 23:53:02 UTC ++++ multiarc/src/formats/7z/C/7zCrc.c +@@ -86,7 +86,7 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void * + #if !defined(__ARM_FEATURE_CRC32) + #define __ARM_FEATURE_CRC32 1 + #if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers +- #define ATTRIB_CRC __attribute__((__target__("arch=armv8-a+crc"))) ++ #define ATTRIB_CRC __attribute__((__target__("crc"))) + #endif + #endif + #if defined(__ARM_FEATURE_CRC32) diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c new file mode 100644 index 000000000000..c8af49af90ff --- /dev/null +++ b/misc/far2l/files/patch-multiarc_src_formats_7z_C_CpuArch.c @@ -0,0 +1,19 @@ +--- multiarc/src/formats/7z/C/CpuArch.c.orig 2023-01-14 23:53:02 UTC ++++ multiarc/src/formats/7z/C/CpuArch.c +@@ -422,7 +422,16 @@ BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYP + + #ifdef USE_HWCAP + ++#ifdef __FreeBSD__ ++static unsigned long getauxval(int aux) ++{ ++ unsigned long auxval = 0; ++ elf_aux_info(aux, &auxval, sizeof(auxval)); ++ return auxval; ++} ++#else + #include ++#endif + + #define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ + BoolInt CPU_IsSupported_ ## name1() { return (getauxval(AT_HWCAP) & (HWCAP_ ## name2)) ? 1 : 0; } diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c new file mode 100644 index 000000000000..39bb0317e2d6 --- /dev/null +++ b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha1Opt.c @@ -0,0 +1,12 @@ +--- multiarc/src/formats/7z/C/Sha1Opt.c.orig 2023-01-14 23:53:02 UTC ++++ multiarc/src/formats/7z/C/Sha1Opt.c +@@ -234,7 +234,8 @@ void MY_FAST_CALL Sha1_UpdateBlocks_HW(UInt32 state[5] + + #if defined(__clang__) || defined(__GNUC__) + #ifdef MY_CPU_ARM64 +- #define ATTRIB_SHA __attribute__((__target__("+crypto"))) ++ #define __ARM_FEATURE_SHA2 ++ #define ATTRIB_SHA __attribute__((__target__("sha2"))) + #else + #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) + #endif diff --git a/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c new file mode 100644 index 000000000000..c36041a3e2cf --- /dev/null +++ b/misc/far2l/files/patch-multiarc_src_formats_7z_C_Sha256Opt.c @@ -0,0 +1,12 @@ +--- multiarc/src/formats/7z/C/Sha256Opt.c.orig 2023-01-14 23:53:02 UTC ++++ multiarc/src/formats/7z/C/Sha256Opt.c +@@ -234,7 +234,8 @@ void MY_FAST_CALL Sha256_UpdateBlocks_HW(UInt32 state[ + + #if defined(__clang__) || defined(__GNUC__) + #ifdef MY_CPU_ARM64 +- #define ATTRIB_SHA __attribute__((__target__("+crypto"))) ++ #define __ARM_FEATURE_SHA2 ++ #define ATTRIB_SHA __attribute__((__target__("sha2"))) + #else + #define ATTRIB_SHA __attribute__((__target__("fpu=crypto-neon-fp-armv8"))) + #endif