Received: by mail.netbsd.org (Postfix, from userid 605) id 1543A84E68; Sun, 30 Apr 2023 01:39:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 44CE984E66 for ; Sun, 30 Apr 2023 01:39:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id DJk8FDCc6CgL for ; Sun, 30 Apr 2023 01:39:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id A8D7184CDC for ; Sun, 30 Apr 2023 01:39:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A1E71FA87; Sun, 30 Apr 2023 01:39:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1682818760223240" MIME-Version: 1.0 Date: Sun, 30 Apr 2023 01:39:20 +0000 From: "David A. Holland" Subject: CVS commit: pkgsrc/archivers/zstd To: pkgsrc-changes@NetBSD.org Reply-To: dholland@netbsd.org X-Mailer: log_accum Message-Id: <20230430013920.A1E71FA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1682818760223240 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: dholland Date: Sun Apr 30 01:39:20 UTC 2023 Modified Files: pkgsrc/archivers/zstd: distinfo Added Files: pkgsrc/archivers/zstd/patches: patch-lib_decompress_huf__decompress__amd64.S Log Message: PR 57383 Mike Owens: zstd assembler bug on SPARC Put amd64 assembler directives inside the amd64 ifdefs so they don't get assembled on other targets. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 pkgsrc/archivers/zstd/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1682818760223240 Content-Disposition: inline Content-Length: 2241 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/archivers/zstd/distinfo diff -u pkgsrc/archivers/zstd/distinfo:1.35 pkgsrc/archivers/zstd/distinfo:1.36 --- pkgsrc/archivers/zstd/distinfo:1.35 Fri Apr 7 10:02:14 2023 +++ pkgsrc/archivers/zstd/distinfo Sun Apr 30 01:39:20 2023 @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.35 2023/04/07 10:02:14 wiz Exp $ +$NetBSD: distinfo,v 1.36 2023/04/30 01:39:20 dholland Exp $ BLAKE2s (zstd-1.5.5.tar.gz) = 55b05a841f3a1a68ec826ee7b9f372ae54ab077e29795ae77e324ef7a4d9b729 SHA512 (zstd-1.5.5.tar.gz) = 356994e0d8188ce97590bf86b602eb50cbcb2f951594afb9c2d6e03cc68f966862505afc4a50e76efd55e4cfb11dbc9b15c7837b7827a961a1311ef72cd23505 Size (zstd-1.5.5.tar.gz) = 2386533 bytes SHA1 (patch-Makefile) = 35159f44eb1d212395a53a27de60d3d1a5d3d014 SHA1 (patch-lib_Makefile) = b04f9d1dcc7b336872566785e7b0db69929eb262 +SHA1 (patch-lib_decompress_huf__decompress__amd64.S) = da62de27a01a872e0534f42b52710de029d7eba1 SHA1 (patch-tests_Makefile) = b4aa7bd0bf1b3e7df231a32dadc6cce4ab78ac9e SHA1 (patch-tests_playTests.sh) = 349f8e400f46b5914add4aee955a040045f62779 SHA1 (patch-zlibWrapper_examples_minigzip.c) = 4ed0cb648bdd6efa61b3f66ba6eb1ea74b7767ec Added files: Index: pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S diff -u /dev/null pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S:1.1 --- /dev/null Sun Apr 30 01:39:20 2023 +++ pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S Sun Apr 30 01:39:20 2023 @@ -0,0 +1,25 @@ +$NetBSD: patch-lib_decompress_huf__decompress__amd64.S,v 1.1 2023/04/30 01:39:20 dholland Exp $ + +Move the stack marking stuff inside the ifdef, as it doesn't necessarily +work on non-amd64. + +--- lib/decompress/huf_decompress_amd64.S~ 2023-04-04 20:13:52.000000000 +0000 ++++ lib/decompress/huf_decompress_amd64.S +@@ -10,6 +10,8 @@ + + #include "../common/portability_macros.h" + ++#if ZSTD_ENABLE_ASM_X86_64_BMI2 ++ + /* Stack marking + * ref: https://wiki.gentoo.org/wiki/Hardened/GNU_stack_quickstart + */ +@@ -17,8 +19,6 @@ + .section .note.GNU-stack,"",%progbits + #endif + +-#if ZSTD_ENABLE_ASM_X86_64_BMI2 +- + /* Calling convention: + * + * %rdi contains the first argument: HUF_DecompressAsmArgs*. --_----------=_1682818760223240--