From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Mon, 2 Oct 2023 23:25:43 +0000 (-0700)
Subject: Merge pull request #3777 from facebook/fix_x32
X-Git-Tag: v1.5.6^2~84^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f77b81c8a15976d79070ec995adbbe8ba5a6966;p=thirdparty%2Fzstd.git

Merge pull request #3777 from facebook/fix_x32

fix x32 tests on Github CI
---

4f77b81c8a15976d79070ec995adbbe8ba5a6966
diff --cc build/cmake/lib/CMakeLists.txt
index cf1252e19,cf1252e19..11a21f28d
--- a/build/cmake/lib/CMakeLists.txt
+++ b/build/cmake/lib/CMakeLists.txt
@@@ -38,11 -38,11 +38,15 @@@ include_directories(${LIBRARY_DIR} ${LI
  
  file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
  file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
++file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
  if (MSVC)
--    file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
      add_compile_options(-DZSTD_DISABLE_ASM)
  else ()
--    file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c ${LIBRARY_DIR}/decompress/*.S)
++    if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*")
++        set(DecompressSources ${DecompressSources} ${LIBRARY_DIR}/decompress/huf_decompress_amd64.S)
++    else()
++        add_compile_options(-DZSTD_DISABLE_ASM)
++    endif()
  endif ()
  file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
  file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c)