From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Mar 2025 04:35:28 +0000 (-0700)
Subject: Merge tag 'zstd-linus-v6.15-rc1' of https://github.com/terrelln/linux
X-Git-Tag: v6.15-rc1~161
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e61f33273ca755b3e2ebee4520a76097199dc7a8;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'zstd-linus-v6.15-rc1' of https://github.com/terrelln/linux

Pull zstd updates from Nick Terrell:
 "Update zstd to the latest upstream release v1.5.7.

  The two major motivations for updating Zstandard are to keep the code
  up to date, and to expose API's needed by Intel for the QAT
  compression accelerator.

  Imported cleanly from the upstream tag v1.5.7-kernel, which is signed
  by upstream's signing key EF8FE99528B52FFD"

Link: https://github.com/facebook/zstd/releases/tag/v1.5.7
Link: https://github.com/facebook/zstd/releases/tag/v1.5.7-kernel
Link: https://keyserver.ubuntu.com/pks/lookup?search=EF8FE99528B52FFD&fingerprint=on&op=index

* tag 'zstd-linus-v6.15-rc1' of https://github.com/terrelln/linux:
  zstd: Import upstream v1.5.7
---

e61f33273ca755b3e2ebee4520a76097199dc7a8
diff --cc lib/zstd/common/portability_macros.h
index 0dde8bf56595e,05286af726835..e1890b32da88b
--- a/lib/zstd/common/portability_macros.h
+++ b/lib/zstd/common/portability_macros.h
@@@ -53,15 -59,15 +59,15 @@@
   * Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
   */
  #ifndef DYNAMIC_BMI2
-   #if ((defined(__clang__) && __has_attribute(__target__)) \
+ #  if ((defined(__clang__) && __has_attribute(__target__)) \
        || (defined(__GNUC__) \
 -          && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))) \
 +          && (__GNUC__ >= 11))) \
-       && (defined(__x86_64__) || defined(_M_X64)) \
+       && (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_X64)) \
        && !defined(__BMI2__)
-   #  define DYNAMIC_BMI2 1
-   #else
-   #  define DYNAMIC_BMI2 0
-   #endif
+ #    define DYNAMIC_BMI2 1
+ #  else
+ #    define DYNAMIC_BMI2 0
+ #  endif
  #endif
  
  /*