]> git.ipfire.org Git - thirdparty/zstd.git/commitdiff
Merge pull request #3777 from facebook/fix_x32 3760/head
authorYann Collet <Cyan4973@users.noreply.github.com>
Mon, 2 Oct 2023 23:25:43 +0000 (16:25 -0700)
committerJean-Michaël Celerier <jeanmichael.celerier@gmail.com>
Fri, 6 Oct 2023 12:05:29 +0000 (08:05 -0400)
fix x32 tests on Github CI

1  2 
build/cmake/lib/CMakeLists.txt

index cf1252e1964257e66b47147746b13fa63d4a9234,cf1252e1964257e66b47147746b13fa63d4a9234..11a21f28d8982f621f1a38bf40c62f897db68101
@@@ -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)