From 85920df37a0696301f98f6a984f181824dee5ebe Mon Sep 17 00:00:00 2001 From: Arzhan Kinzhalin Date: Thu, 1 Dec 2022 10:38:00 -0800 Subject: [PATCH 1/2] Fix CMakeLists.txt to add the source files. As well as their compilation options. --- CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6945d7b4..af5806c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,21 +107,32 @@ set(ZLIB_SRCS adler32.c compress.c crc32.c + crc_folding.c deflate.c + deflate_medium.c + deflate_quick.c gzclose.c gzlib.c gzread.c gzwrite.c - inflate.c infback.c - inftrees.c inffast.c + inflate.c + inftrees.c + match.c + slide_sse.c trees.c uncompr.c x86.c zutil.c ) +if (CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang") + set_source_files_properties(crc_folding.c PROPERTIES COMPILE_OPTIONS "-mpclmul;-msse4") + set_source_files_properties(slide_sse.c PROPERTIES COMPILE_OPTIONS -msse2) + set_source_files_properties(deflate_quick.c PROPERTIES COMPILE_OPTIONS -msse4) +endif() + if(NOT MINGW) set(ZLIB_DLL_SRCS win32/zlib1.rc # If present will override custom build rule below. From 95937265e182b92475c5dd4f9171bac59c085c34 Mon Sep 17 00:00:00 2001 From: Arzhan Kinzhalin Date: Thu, 1 Dec 2022 10:41:40 -0800 Subject: [PATCH 2/2] CI: remove the platforms we don't support. --- .github/workflows/configure.yml | 122 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml index 712c7234..c5080ea7 100644 --- a/.github/workflows/configure.yml +++ b/.github/workflows/configure.yml @@ -21,67 +21,67 @@ jobs: build-dir: ../build src-dir: ../zlib - - name: Ubuntu GCC ARM SF - os: ubuntu-latest - compiler: arm-linux-gnueabi-gcc - configure-args: --warn - chost: arm-linux-gnueabi - packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross - qemu-run: qemu-arm -L /usr/arm-linux-gnueabi - - - name: Ubuntu GCC ARM HF - os: ubuntu-latest - compiler: arm-linux-gnueabihf-gcc - configure-args: --warn - chost: arm-linux-gnueabihf - packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross - qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf - - - name: Ubuntu GCC AARCH64 - os: ubuntu-latest - compiler: aarch64-linux-gnu-gcc - configure-args: --warn - chost: aarch64-linux-gnu - packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross - qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu - - - name: Ubuntu GCC PPC - os: ubuntu-latest - compiler: powerpc-linux-gnu-gcc - configure-args: --warn --static - chost: powerpc-linux-gnu - packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross - qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu - cflags: -static - ldflags: -static - - - name: Ubuntu GCC PPC64 - os: ubuntu-latest - compiler: powerpc64-linux-gnu-gcc - configure-args: --warn --static - chost: powerpc-linux-gnu - packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross - qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu - cflags: -static - ldflags: -static - - - name: Ubuntu GCC PPC64LE - os: ubuntu-latest - compiler: powerpc64le-linux-gnu-gcc - configure-args: --warn - chost: powerpc64le-linux-gnu - packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross - qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu - - - name: Ubuntu GCC S390X - os: ubuntu-latest - compiler: s390x-linux-gnu-gcc - configure-args: --warn --static - chost: s390x-linux-gnu - packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross - qemu-run: qemu-s390x -L /usr/s390x-linux-gnu - cflags: -static - ldflags: -static +# - name: Ubuntu GCC ARM SF +# os: ubuntu-latest +# compiler: arm-linux-gnueabi-gcc +# configure-args: --warn +# chost: arm-linux-gnueabi +# packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross +# qemu-run: qemu-arm -L /usr/arm-linux-gnueabi +# +# - name: Ubuntu GCC ARM HF +# os: ubuntu-latest +# compiler: arm-linux-gnueabihf-gcc +# configure-args: --warn +# chost: arm-linux-gnueabihf +# packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armhf-cross +# qemu-run: qemu-arm -L /usr/arm-linux-gnueabihf +# +# - name: Ubuntu GCC AARCH64 +# os: ubuntu-latest +# compiler: aarch64-linux-gnu-gcc +# configure-args: --warn +# chost: aarch64-linux-gnu +# packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross +# qemu-run: qemu-aarch64 -L /usr/aarch64-linux-gnu +# +# - name: Ubuntu GCC PPC +# os: ubuntu-latest +# compiler: powerpc-linux-gnu-gcc +# configure-args: --warn --static +# chost: powerpc-linux-gnu +# packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross +# qemu-run: qemu-ppc -L /usr/powerpc-linux-gnu +# cflags: -static +# ldflags: -static +# +# - name: Ubuntu GCC PPC64 +# os: ubuntu-latest +# compiler: powerpc64-linux-gnu-gcc +# configure-args: --warn --static +# chost: powerpc-linux-gnu +# packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross +# qemu-run: qemu-ppc64 -L /usr/powerpc64-linux-gnu +# cflags: -static +# ldflags: -static +# +# - name: Ubuntu GCC PPC64LE +# os: ubuntu-latest +# compiler: powerpc64le-linux-gnu-gcc +# configure-args: --warn +# chost: powerpc64le-linux-gnu +# packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross +# qemu-run: qemu-ppc64le -L /usr/powerpc64le-linux-gnu +# +# - name: Ubuntu GCC S390X +# os: ubuntu-latest +# compiler: s390x-linux-gnu-gcc +# configure-args: --warn --static +# chost: s390x-linux-gnu +# packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross +# qemu-run: qemu-s390x -L /usr/s390x-linux-gnu +# cflags: -static +# ldflags: -static - name: macOS GCC os: macos-latest