From nobody Fri Apr 14 14:19:54 2023 X-Original-To: dev-commits-ports-branches@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 4PydrC03B3z45Kvx; Fri, 14 Apr 2023 14:19: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 4PydrB63MDz45gt; Fri, 14 Apr 2023 14:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481994; 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=SgoJbVc3M3Si5jXNcHyEOD2S3+g91rrAHX2krAv1rls=; b=PQYfB3Ss29akp/C7hTVDDvAFrk3IkUA1naipvR2R7BSBr8TToD42XUtrXY5rTWzxBi5BBo rEMMpjxhE3QtUqDmpW5PaLg9DjEYHV6DRHR+qpms6SG8i45HZk/pCAj50485cQaKg6809l 7CwgNdIrDx9x9Vsvf5z7OV0Y95V9UbMUSr3CLb8OMZBPGJzQxZrdkfRZzu3SGre3KDWVti 0X9+QOtrxCAWOKkOfqON9Zw2qcCZ3fuTsx0TUPUomuI33eLxDS/wOh8eja1YESziz24E56 3947b9HyuLUHfbH85ucAeKmkPCMVOZqAKpDKzraADbkfzkHJtD3tcaYQ9KHVfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481994; 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=SgoJbVc3M3Si5jXNcHyEOD2S3+g91rrAHX2krAv1rls=; b=cXb8RLnEqC+4MDX7ytZ5yW98zrAd4mKI0ZcLImFvNNpDuyOpY0eKjt4Oi27LzX7+86zl5h sP6j3UZrzk2co/SvmVRhL7n4DK1ZJEX6M1KBipQPWqCkj12kKIzqMrL/HxpLfoZDxKVOf/ p0V+zPi8nnpLSwDAo9ithIvFvzXbBsKHL8Y0ktehpD6Q11PP4KC3Uc85exXGQseHuh6Qt9 zqZkHzevtemHqoF3Uc2QS5JfZHuwaPWRHrawWJE74EDt8tJCGrreIMtUCshq2rGxyYqscw ARdY8JBqJEoq9jFLALeBmek2VxHNfhvI9eJZ7WMlbOqMCB+OaQpWbXWAqFJlkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481994; a=rsa-sha256; cv=none; b=OcXcDLt7Ouj05MigKyfa86x6PvPvRY1FeQXSy4mEl4GjwCgRnp5QR+XeXWcEGOv2m14E1p FOnvNdZmun+0OjFL1YrRnkgj8EXB9eFN6RHjNRFei6YyX/fmN0Gr5VYry/4VtAWBqPw615 /TCzgxtTh0zQiH3m/4ZYprOfXym7TGCpxBLtSvKyiYiLPl+Fvg6+o4LCW9p9opXTztFZAf MttvRALWi3+3Nx4iBaMPDBvc7ic3T10XUGnC1RdDrv4imGLgKt1h/1mqFSsaoDOSd7btX5 duFDekXTI1zGAbOVonlE+ia92cdK/SGyuowH8dsOKrATOxpDUB1MiQiGMUMI2Q== 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 4PydrB4TprzS3w; Fri, 14 Apr 2023 14:19: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 33EEJsau009060; Fri, 14 Apr 2023 14:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEJs4I009059; Fri, 14 Apr 2023 14:19:54 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:19:54 GMT Message-Id: <202304141419.33EEJs4I009059@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 96167b41ab11 - 2023Q2 - archivers/snappy: fix build on armv7 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 96167b41ab1143f7ee78afc8440ea5ec81e87089 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=96167b41ab1143f7ee78afc8440ea5ec81e87089 commit 96167b41ab1143f7ee78afc8440ea5ec81e87089 Author: Robert Clausecker AuthorDate: 2023-04-13 12:54:28 +0000 Commit: Robert Clausecker CommitDate: 2023-04-14 14:19:44 +0000 archivers/snappy: fix build on armv7 A recent commit introduced NEON intrinsics that are only available on aarch64. Work around this problem by adding polyfill for the missing intrinsic. Approved by: portmgr (build fix blanket) Obtained from: https://stackoverflow.com/a/70154591/417501 See also: https://groups.google.com/g/snappy-compression/c/m1ZNPsobiQs MFH: 2023Q2 (cherry picked from commit 9a0a2422622d5feee7d77ddc954540daff449a1d) --- archivers/snappy/files/patch-snappy-internal.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/archivers/snappy/files/patch-snappy-internal.h b/archivers/snappy/files/patch-snappy-internal.h new file mode 100644 index 000000000000..c00d2397a50c --- /dev/null +++ b/archivers/snappy/files/patch-snappy-internal.h @@ -0,0 +1,18 @@ +--- snappy-internal.h.orig 2023-04-13 12:38:13 UTC ++++ snappy-internal.h +@@ -102,6 +102,15 @@ inline void V128_StoreU(V128* dst, V128 val) { + vst1q_u8(reinterpret_cast(dst), val); + } + ++#ifdef __arm__ ++inline uint8x16_t vqtbl1q_u8(uint8x16_t table, uint8x16_t idx) { ++ uint8x8x2_t table2{vget_low_u8(table), vget_high_u8(table)}; ++ uint8x8_t lo = vtbl2_u8(table2, vget_low_u8(idx)); ++ uint8x8_t hi = vtbl2_u8(table2, vget_high_u8(idx)); ++ return vcombine_u8(lo, hi); ++} ++#endif ++ + inline V128 V128_Shuffle(V128 input, V128 shuffle_mask) { + assert(vminvq_u8(shuffle_mask) >= 0 && vmaxvq_u8(shuffle_mask) <= 15); + return vqtbl1q_u8(input, shuffle_mask);