ddidderr/zstd-rs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3777 from facebook/fix_x32

Browse Source 
fix x32 tests on Github CI
This commit is contained in:
Yann Collet
2023-10-06 08:05:29 -04:00
committed by Jean-Michaël Celerier
parent 43118da8a7 2c17e05646
commit 4f77b81c8a
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/dev-short-tests.yml
+1 -1
View File
@@ -38,7 +38,7 @@ jobs:
CFLAGS="-m32 -O1 -fstack-protector" make check V=1 CFLAGS="-m32 -O1 -fstack-protector" make check V=1
check-x32: check-x32:
runs-on: ubuntu-latest runs-on: ubuntu-20.04 # ubuntu-latest == ubuntu-22.04 have issues currently with x32
steps: steps:
- uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # tag=v3 - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # tag=v3
- name: make check on x32 ABI # https://en.wikipedia.org/wiki/X32_ABI - name: make check on x32 ABI # https://en.wikipedia.org/wiki/X32_ABI
build/cmake/lib/CMakeLists.txt
+6 -2
View File
@@ -38,11 +38,15 @@ include_directories(${LIBRARY_DIR} ${LIBRARY_DIR}/common)
file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c) file(GLOB CommonSources ${LIBRARY_DIR}/common/*.c)
file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c) file(GLOB CompressSources ${LIBRARY_DIR}/compress/*.c)
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
if (MSVC) if (MSVC)
file(GLOB DecompressSources ${LIBRARY_DIR}/decompress/*.c)
add_compile_options(-DZSTD_DISABLE_ASM) add_compile_options(-DZSTD_DISABLE_ASM)
else () 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 () endif ()
file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c) file(GLOB DictBuilderSources ${LIBRARY_DIR}/dictBuilder/*.c)
file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c) file(GLOB DeprecatedSources ${LIBRARY_DIR}/deprecated/*.c)