CVS commit: [pkgsrc-2023Q1] pkgsrc/archivers/zstd

["S.P.Zeidler" <spz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   spz
Date:           Mon May 15 17:49:47 UTC 2023

Modified Files:
        pkgsrc/archivers/zstd [pkgsrc-2023Q1]: distinfo
Added Files:
        pkgsrc/archivers/zstd/patches [pkgsrc-2023Q1]:
            patch-lib_decompress_huf__decompress__amd64.S

Log Message:
Pullup ticket #6757 - requested by dholland
archivers/zstd: build fix

Revisions pulled up:
- archivers/zstd/distinfo                                       1.36
- archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S 1.1

-------------------------------------------------------------------
   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


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.34.2.1 pkgsrc/archivers/zstd/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    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.

Modified files:

Index: pkgsrc/archivers/zstd/distinfo
diff -u pkgsrc/archivers/zstd/distinfo:1.34 pkgsrc/archivers/zstd/distinfo:1.34.2.1
--- pkgsrc/archivers/zstd/distinfo:1.34 Fri Feb 10 21:32:14 2023
+++ pkgsrc/archivers/zstd/distinfo      Mon May 15 17:49:47 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2023/02/10 21:32:14 wiz Exp $
+$NetBSD: distinfo,v 1.34.2.1 2023/05/15 17:49:47 spz Exp $
 
 BLAKE2s (zstd-1.5.4.tar.gz) = 9535118a5388e4df8735861cad6e7c719bba38033c436c4d38b3fe6d459e4cfd
 SHA512 (zstd-1.5.4.tar.gz) = b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863
@@ -6,5 +6,6 @@ Size (zstd-1.5.4.tar.gz) = 2178759 bytes
 SHA1 (patch-Makefile) = 35159f44eb1d212395a53a27de60d3d1a5d3d014
 SHA1 (patch-lib_Makefile) = b04f9d1dcc7b336872566785e7b0db69929eb262
 SHA1 (patch-tests_Makefile) = 0da7f18e07ca4ffa7dcce46709224b0f61caaea7
+SHA1 (patch-lib_decompress_huf__decompress__amd64.S) = da62de27a01a872e0534f42b52710de029d7eba1
 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.2.2
--- /dev/null   Mon May 15 17:49:47 2023
+++ pkgsrc/archivers/zstd/patches/patch-lib_decompress_huf__decompress__amd64.S Mon May 15 17:49:47 2023
@@ -0,0 +1,25 @@
+$NetBSD: patch-lib_decompress_huf__decompress__amd64.S,v 1.1.2.2 2023/05/15 17:49:47 spz 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*.