From: Yann Collet <cyan@fb.com>
Date: Sat, 11 Dec 2021 05:02:17 +0000 (-0800)
Subject: fixed x32 compatibility
X-Git-Tag: v1.5.1~1^2~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2922%2Fhead;p=thirdparty%2Fzstd.git

fixed x32 compatibility
---

diff --git a/lib/decompress/huf_decompress.c b/lib/decompress/huf_decompress.c
index a00f938ce..fa61968ba 100644
--- a/lib/decompress/huf_decompress.c
+++ b/lib/decompress/huf_decompress.c
@@ -172,8 +172,9 @@ static size_t HUF_DecompressAsmArgs_init(HUF_DecompressAsmArgs* args, void* dst,
 
     BYTE* const oend = (BYTE*)dst + dstSize;
 
-    /* We're assuming x86-64 BMI2 - assure that this is the case. */
-    assert(MEM_isLittleEndian() && !MEM_32bits());
+    /* The following condition is false on x32 platform,
+     * but HUF_asm is not compatible with this ABI */
+    if (!(MEM_isLittleEndian() && !MEM_32bits())) return 1;
 
     /* strict minimum : jump table + 1 byte per stream */
     if (srcSize < 10)