logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git
commit: 85311c2b16b67904aa6d5de9a1ea78a5138d6193
parent 02ce2286f445234e7bbb04c95a1e5168e0d48c35
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 27 May 2021 01:12:26 -0700

zstd: Fix ZSTD_VecMask_next portable fallback

Diffstat:

Apkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch26++++++++++++++++++++++++++
Mpkg/zstd/ver2+-
2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch b/pkg/zstd/patch/0002-ZSTD_VecMask_next-fix-incorrect-variable-name-in-fal.patch @@ -0,0 +1,26 @@ +From 0f2837d010dce1f0a384c3ba6f54a86f39c607d5 Mon Sep 17 00:00:00 2001 +From: Dan Nelson <dnelson_1901@yahoo.com> +Date: Sat, 15 May 2021 10:20:37 -0500 +Subject: [PATCH] ZSTD_VecMask_next: fix incorrect variable name in fallback + code path + +--- + lib/compress/zstd_lazy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/compress/zstd_lazy.c b/lib/compress/zstd_lazy.c +index 3d523e84..9e13f37c 100644 +--- a/lib/compress/zstd_lazy.c ++++ b/lib/compress/zstd_lazy.c +@@ -1081,7 +1081,7 @@ static U32 ZSTD_VecMask_next(ZSTD_VecMask val) { + 0, 1, 28, 2, 29, 14, 24, 3, 30, 22, 20, 15, 25, 17, 4, 8, + 31, 27, 13, 23, 21, 19, 16, 7, 26, 12, 18, 6, 11, 5, 10, 9 + }; +- return multiplyDeBruijnBitPosition[((U32)((v & -(int)v) * 0x077CB531U)) >> 27]; ++ return multiplyDeBruijnBitPosition[((U32)((val & -(int)val) * 0x077CB531U)) >> 27]; + # endif + } + +-- +2.31.1 + diff --git a/pkg/zstd/ver b/pkg/zstd/ver @@ -1 +1 @@ -1.5.0 r0 +1.5.0 r1