Merge "Upgrade libz-sys to 1.1.8" am: 37720788c1 am: 437ffc28c1

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/libz-sys/+/2344984

Change-Id: I72c96910ddb4fe41c5ba03ed7ec89291eaef850c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

8 files changed, 449 insertions, 191 deletions

diff --git a/src/zlib-ng/.github/workflows/cmake.yml b/src/zlib-ng/.github/workflows/cmake.yml
index 95d3b5a..0525836 100644
--- a/src/zlib-ng/.github/workflows/cmake.yml
+++ b/src/zlib-ng/.github/workflows/cmake.yml
@@ -8,297 +8,334 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - name: Ubuntu 16.04 GCC
-            os: ubuntu-16.04
+          - name: Ubuntu 18.04 GCC
+            os: ubuntu-18.04
             compiler: gcc
+            cxx-compiler: g++
 
-          - name: Ubuntu GCC
+          - name: Ubuntu GCC ASAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DWITH_SANITIZER=Address
             codecov: ubuntu_gcc
 
-          - name: Ubuntu GCC OSB -O1 No Unaligned64
+          - name: Ubuntu GCC Benchmark
             os: ubuntu-latest
             compiler: gcc
-            cmake-args: -DWITH_UNALIGNED=ON -DUNALIGNED64_OK=OFF -DWITH_SANITIZER=Undefined
+            cxx-compiler: g++
+            cmake-args: -DWITH_BENCHMARKS=ON
+            codecov: ubuntu_gcc_benchmark
+
+          - name: Ubuntu GCC Symbol Prefix
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+            codecov: ubuntu_gcc_sprefix
+
+          - name: Ubuntu GCC Compat Symbol Prefix
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DZLIB_COMPAT=ON -DZLIB_SYMBOL_PREFIX=zTest_
+            codecov: ubuntu_gcc_compat_sprefix
+
+          - name: Ubuntu GCC -O3 OSB
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
             build-dir: ../build
             build-src-dir: ../zlib-ng
             codecov: ubuntu_gcc_osb
-            cflags: -O1 -g3
+            cflags: -O3
 
-          - name: Ubuntu GCC -O3 No Unaligned
+          - name: Ubuntu GCC -O1 No Unaligned UBSAN
             os: ubuntu-latest
             compiler: gcc
-            cmake-args: -DWITH_UNALIGNED=OFF
-            codecov: ubuntu_gcc_o3
-            cflags: -O3
+            cxx-compiler: g++
+            cmake-args: -DWITH_UNALIGNED=OFF -DWITH_SANITIZER=Undefined
+            codecov: ubuntu_gcc_o1
+            cflags: -O1
+
+          - name: Ubuntu GCC 32-bit
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32 -DCMAKE_SHARED_LINKER_FLAGS=-m32 -DCMAKE_EXE_LINKER_FLAGS=-m32
+            packages: gcc-multilib g++-multilib
+            codecov: ubuntu_gcc_m32
+
+          - name: Ubuntu GCC No CTZLL
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DWITH_OPTIM=OFF -DHAVE_BUILTIN_CTZLL=OFF
+            codecov: ubuntu_gcc_no_ctzll
+
+          - name: Ubuntu GCC No CTZ
+            os: ubuntu-latest
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DWITH_OPTIM=OFF -DHAVE_BUILTIN_CTZLL=OFF -DHAVE_BUILTIN_CTZ=OFF
+            codecov: ubuntu_gcc_no_ctz
 
           - name: Ubuntu GCC Link Zlib
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DZLIB_DUAL_LINK=ON
 
-          - name: Ubuntu GCC No AVX2
+          - name: Ubuntu GCC No AVX2 UBSAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DWITH_AVX2=OFF -DWITH_SANITIZER=Undefined
             codecov: ubuntu_gcc_no_avx2
 
-          - name: Ubuntu GCC No SSE2
+          - name: Ubuntu GCC No SSE2 UBSAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DWITH_SSE2=OFF -DWITH_SANITIZER=Undefined
             codecov: ubuntu_gcc_no_sse2
 
-          - name: Ubuntu GCC No SSE4
+          - name: Ubuntu GCC No SSE4 UBSAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DWITH_SSE4=OFF -DWITH_SANITIZER=Undefined
             codecov: ubuntu_gcc_no_sse4
 
-          - name: Ubuntu GCC No PCLMULQDQ
+          - name: Ubuntu GCC No PCLMULQDQ UBSAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DWITH_PCLMULQDQ=OFF -DWITH_SANITIZER=Undefined
             codecov: ubuntu_gcc_no_pclmulqdq
 
-          - name: Ubuntu GCC Compat No Opt
+          - name: Ubuntu GCC Compat No Opt ASAN
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Address
             codecov: ubuntu_gcc_compat_no_opt
             cflags: -DNOT_TWEAK_COMPILER
 
-          - name: Ubuntu GCC ARM SF
+          - name: Ubuntu GCC ARM SF ASAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabi-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabi -DWITH_SANITIZER=Address
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm
+            packages: qemu qemu-user gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libc-dev-armel-cross
             codecov: ubuntu_gcc_armsf
 
-          - name: Ubuntu GCC ARM SF Compat No Opt
+          - name: Ubuntu GCC ARM SF Compat No Opt UBSAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabi-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabi -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabi libc-dev-armel-cross
-            qemu-run: qemu-arm
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
+            packages: qemu qemu-user gcc-arm-linux-gnueabi g++-arm-linux-gnueabi libc-dev-armel-cross
             codecov: ubuntu_gcc_armsf_compat_no_opt
 
-          - name: Ubuntu GCC ARM HF
+          - name: Ubuntu GCC ARM HF ASAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf -DWITH_SANITIZER=Address
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
+            packages: qemu qemu-user gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc-dev-armel-cross
             codecov: ubuntu_gcc_armhf
 
-          - name: Ubuntu GCC ARM HF No ACLE
+          - name: Ubuntu GCC ARM HF No ACLE ASAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf -DWITH_ACLE=OFF -DWITH_SANITIZER=Address
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_ACLE=OFF -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
+            packages: qemu qemu-user gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc-dev-armel-cross
             codecov: ubuntu_gcc_armhf_no_acle
 
-          - name: Ubuntu GCC ARM HF No NEON
+          - name: Ubuntu GCC ARM HF No NEON ASAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf -DWITH_NEON=OFF -DWITH_SANITIZER=Address
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DWITH_NEON=OFF -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
+            packages: qemu qemu-user gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc-dev-armel-cross
             codecov: ubuntu_gcc_armhf_no_neon
 
-          - name: Ubuntu GCC ARM HF Compat No Opt
+          - name: Ubuntu GCC ARM HF Compat No Opt UBSAN
             os: ubuntu-latest
-            compiler: arm-linux-gnueabihf-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-arm-linux-gnueabihf libc-dev-armel-cross
-            qemu-run: qemu-arm
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
+            packages: qemu qemu-user gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc-dev-armel-cross
             codecov: ubuntu_gcc_armhf_compat_no_opt
 
-          - name: Ubuntu GCC AARCH64
+          - name: Ubuntu GCC AARCH64 ASAN
             os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
+            packages: qemu qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
             codecov: ubuntu_gcc_aarch64
 
-          - name: Ubuntu GCC AARCH64 No ACLE
+          - name: Ubuntu GCC AARCH64 No ACLE UBSAN
             os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_ACLE=OFF -DWITH_SANITIZER=Undefined
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
+            packages: qemu qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
             codecov: ubuntu_gcc_aarch64_no_acle
 
-          - name: Ubuntu GCC AARCH64 No NEON
+          - name: Ubuntu GCC AARCH64 No NEON UBSAN
             os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DWITH_NEON=OFF -DWITH_SANITIZER=Undefined
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
+            packages: qemu qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
             codecov: ubuntu_gcc_aarch64_no_neon
 
-          - name: Ubuntu GCC AARCH64 Compat No Opt
+          - name: Ubuntu GCC AARCH64 Compat No Opt UBSAN
             os: ubuntu-latest
-            compiler: aarch64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF -DWITH_SANITIZER=Undefined
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
-            qemu-run: qemu-aarch64
+            packages: qemu qemu-user gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc-dev-arm64-cross
             codecov: ubuntu_gcc_aarch64_compat_no_opt
 
           - name: Ubuntu GCC PPC
             os: ubuntu-latest
-            compiler: powerpc-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            qemu-run: qemu-ppc
-            ldflags: -static
+            packages: qemu qemu-user gcc-powerpc-linux-gnu g++-powerpc-linux-gnu libc-dev-powerpc-cross
             codecov: ubuntu_gcc_ppc
 
+          - name: Ubuntu GCC PPC No Power8
+            os: ubuntu-latest
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake -DWITH_POWER8=OFF
+            packages: qemu qemu-user gcc-powerpc-linux-gnu g++-powerpc-linux-gnu libc-dev-powerpc-cross
+            codecov: ubuntu_gcc_ppc_no_power8
+
           - name: Ubuntu GCC PPC64
             os: ubuntu-latest
-            compiler: powerpc64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64.cmake
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
-            qemu-run: qemu-ppc64
+            packages: qemu qemu-user gcc-powerpc64-linux-gnu g++-powerpc64-linux-gnu libc-dev-ppc64-cross
             ldflags: -static
             codecov: ubuntu_gcc_ppc64
 
           - name: Ubuntu GCC PPC64LE
             os: ubuntu-latest
-            compiler: powerpc64le-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
-            qemu-run: qemu-ppc64le
+            packages: qemu qemu-user gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu libc-dev-ppc64el-cross
             codecov: ubuntu_gcc_ppc64le
 
           - name: Ubuntu GCC SPARC64
             os: ubuntu-latest
-            compiler: sparc64-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-sparc64.cmake
-            asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-sparc64-linux-gnu libc-dev-sparc64-cross
-            qemu-run: qemu-sparc64
+            packages: qemu qemu-user gcc-sparc64-linux-gnu g++-sparc64-linux-gnu libc-dev-sparc64-cross
             ldflags: -static
             codecov: ubuntu_gcc_sparc64
 
-          - name: Ubuntu GCC S390X
+          - name: Ubuntu GCC S390X ASAN
             os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
+            packages: qemu qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross
             ldflags: -static
             codecov: ubuntu_gcc_s390x
 
-          - name: Ubuntu GCC S390X DFLTCC
+          - name: Ubuntu GCC S390X No vectorized CRC32 ASAN
             os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZER=Address
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DWITH_CRC32_VX=OFF -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
+            packages: qemu qemu-user gcc-s390x-linux-gnu g++-s390x-linux-gnu libc-dev-s390x-cross
             ldflags: -static
-            codecov: ubuntu_gcc_s390x
+            codecov: ubuntu_gcc_s390x_no_crc32
 
-          - name: Ubuntu GCC S390X DFLTCC Compat
-            os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DZLIB_COMPAT=ON -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZER=Undefined
+          - name: Ubuntu GCC S390X DFLTCC ASAN
+            os: z15
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZER=Address
             asan-options: detect_leaks=0
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
             ldflags: -static
-            codecov: ubuntu_gcc_s390x
+            codecov: ubuntu_gcc_s390x_dfltcc
+
+          - name: Ubuntu GCC S390X DFLTCC Compat UBSAN
+            os: z15
+            compiler: gcc
+            cxx-compiler: g++
+            cmake-args: -DZLIB_COMPAT=ON -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON -DWITH_SANITIZER=Undefined
+            ldflags: -static
+            codecov: ubuntu_gcc_s390x_dfltcc_compat
 
           - name: Ubuntu MinGW i686
             os: ubuntu-latest
-            compiler: i686-w64-mingw32-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-i686.cmake
-            packages: wine32 gcc-mingw-w64
+            packages: wine32 gcc-mingw-w64-i686 g++-mingw-w64-i686 libpcre2-8-0=10.34-7 libpcre2-8-0:i386=10.34-7 libodbc1=2.3.6-0.1build1 libodbc1:i386=2.3.6-0.1build1
+            ldflags: -static
             codecov: ubuntu_gcc_mingw_i686
             # Limit parallel test jobs to prevent wine errors
             parallels-jobs: 1
 
           - name: Ubuntu MinGW x86_64
             os: ubuntu-latest
-            compiler: x86_64-w64-mingw32-gcc
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-mingw-x86_64.cmake
-            packages: wine-stable gcc-mingw-w64
+            packages: wine-stable gcc-mingw-w64 g++-mingw-w64
+            ldflags: -static
             codecov: ubuntu_gcc_mingw_x86_64
              # Limit parallel test jobs to prevent wine errors
             parallels-jobs: 1
 
-          - name: Ubuntu 16.04 Clang
-            os: ubuntu-16.04
+          - name: Ubuntu 18.04 Clang
+            os: ubuntu-18.04
             compiler: clang-6.0
+            cxx-compiler: clang++-6.0
             packages: clang-6.0
 
           - name: Ubuntu Clang
             os: ubuntu-latest
-            compiler: clang
-            packages: llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
+            compiler: clang-11
+            cxx-compiler: clang++-11
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
             codecov: ubuntu_clang
 
           - name: Ubuntu Clang Inflate Strict
             os: ubuntu-latest
-            compiler: clang
+            compiler: clang-11
+            cxx-compiler: clang++-11
             cmake-args: -DWITH_INFLATE_STRICT=ON
-            packages: llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
             codecov: ubuntu_clang_inflate_strict
 
           - name: Ubuntu Clang Inflate Allow Invalid Dist
             os: ubuntu-latest
-            compiler: clang
+            compiler: clang-11
+            cxx-compiler: clang++-11
             cmake-args: -DWITH_INFLATE_ALLOW_INVALID_DIST=ON
-            packages: llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
             codecov: ubuntu_clang_inflate_allow_invalid_dist
 
+          - name: Ubuntu Clang Reduced Memory
+            os: ubuntu-latest
+            compiler: clang-11
+            cxx-compiler: clang++-11
+            cmake-args: -DWITH_REDUCED_MEM=ON
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
+            codecov: ubuntu_clang_reduced_mem
+
           - name: Ubuntu Clang Memory Map
             os: ubuntu-latest
-            compiler: clang
+            compiler: clang-11
+            cxx-compiler: clang++-11
             cflags: -DUSE_MMAP
-            packages: llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
             codecov: ubuntu_clang_mmap
 
           - name: Ubuntu Clang Debug
             os: ubuntu-latest
-            compiler: clang
-            packages: llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
+            compiler: clang-11
+            cxx-compiler: clang++-11
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
             codecov: ubuntu_clang_debug
             build-config: Debug
 
           - name: Ubuntu Clang MSAN
             os: ubuntu-latest
-            compiler: clang
+            compiler: clang-11
+            cxx-compiler: clang++-11
             cmake-args: -GNinja -DWITH_SANITIZER=Memory
-            packages:  ninja-build llvm-6.0
-            gcov-exec: llvm-cov-6.0 gcov
-            cflags: -g3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -fsanitize-memory-track-origins
-            codecov: ubuntu_clang_msan
+            packages:  ninja-build llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
 
           - name: Windows MSVC Win32
             os: windows-latest
@@ -320,27 +357,39 @@ jobs:
             compiler: cl
             cmake-args: -A ARM64
 
+          - name: Windows ClangCl Win32
+            os: windows-latest
+            cmake-args: -T ClangCl -A Win32
+
+          - name: Windows ClangCl Win64
+            os: windows-latest
+            cmake-args: -T ClangCl -A x64
+
           - name: Windows GCC
             os: windows-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -G Ninja
             codecov: win64_gcc
 
           - name: Windows GCC Compat No Opt
             os: windows-latest
             compiler: gcc
+            cxx-compiler: g++
             cmake-args: -G Ninja -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DWITH_OPTIM=OFF
             codecov: win64_gcc_compat_no_opt
 
-          - name: macOS Clang
+          - name: macOS Clang ASAN
             os: macos-latest
             compiler: clang
+            cxx-compiler: clang++
             cmake-args: -DWITH_SANITIZER=Address
             codecov: macos_clang
 
-          - name: macOS GCC
+          - name: macOS GCC UBSAN
             os: macos-latest
             compiler: gcc-10
+            cxx-compiler: g++-10
             cmake-args: -DWITH_SANITIZER=Undefined
             packages: gcc@10
             gcov-exec: gcov-10
@@ -359,12 +408,16 @@ jobs:
         repository: zlib-ng/corpora
         path: test/data/corpora
 
+    - name: Add repositories (Wine)
+      if: contains(matrix.packages, 'wine')
+      run: |
+        sudo dpkg --add-architecture i386
+
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
       run: |
-        sudo dpkg --add-architecture i386 # Required for wine32
         sudo apt-get update
-        sudo apt-get install -y ${{ matrix.packages }}
+        sudo apt-get install -y --allow-downgrades ${{ matrix.packages }}
 
     - name: Install packages (Windows)
       if: runner.os == 'Windows'
@@ -378,25 +431,35 @@ jobs:
       env:
         HOMEBREW_NO_INSTALL_CLEANUP: 1
 
-    - name: Install codecov.io tools
-      if: matrix.codecov
-      run: |
-        python -u -m pip install codecov
-
     - name: Initialize Wine
       # Prevent parallel test jobs from initializing Wine at the same time
       if: contains(matrix.packages, 'wine')
       run: |
         wineboot --init
 
+    - name: Compile LLVM C++ libraries (MSAN)
+      if: contains(matrix.name, 'MSAN')
+      run: |
+        git clone --depth=1 https://github.com/llvm/llvm-project --single-branch --branch llvmorg-11.0.0
+        cd llvm-project
+        mkdir build
+        cd build
+        cmake -G Ninja ../llvm -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" -DLLVM_USE_SANITIZER=MemoryWithOrigins -DLLVM_LIBC_ENABLE_LINTING=OFF
+        cmake --build . -- cxx cxxabi
+        echo "LLVM_BUILD_DIR=`pwd`" >> $GITHUB_ENV
+      env:
+        CC: ${{ matrix.compiler }}
+        CXX: ${{ matrix.cxx-compiler }}
+
     - name: Generate project files
-      # Shared libaries turned off for qemu ppc* and sparc & reduce code coverage sources
+      # Shared libraries turned off for qemu ppc* and sparc & reduce code coverage sources
       run: |
         mkdir ${{ matrix.build-dir || '.not-used' }}
         cd ${{ matrix.build-dir || '.' }}
-        cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DWITH_FUZZERS=ON -DWITH_CODE_COVERAGE=ON -DWITH_MAINTAINER_WARNINGS=ON
+        cmake ${{ matrix.build-src-dir || '.' }} ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DWITH_FUZZERS=ON ${{ matrix.codecov && '-DWITH_CODE_COVERAGE=ON' }} -DWITH_MAINTAINER_WARNINGS=ON
       env:
         CC: ${{ matrix.compiler }}
+        CXX: ${{ matrix.cxx-compiler }}
         CFLAGS: ${{ matrix.cflags }}
         LDFLAGS: ${{ matrix.ldflags }}
         CI: true
@@ -413,25 +476,31 @@ jobs:
         cd ${{ matrix.build-dir || '.' }}
         ctest --verbose -C Release --output-on-failure --max-width 120 -j ${{ matrix.parallels-jobs || '6' }}
       env:
-        ASAN_OPTIONS: ${{ matrix.asan-options || 'verbosity=0' }}:abort_on_error=1
-        MSAN_OPTIONS: ${{ matrix.msan-options || 'verbosity=0' }}:abort_on_error=1
-        TSAN_OPTIONS: ${{ matrix.tsan-options || 'verbosity=0' }}:abort_on_error=1
-        LSAN_OPTIONS: ${{ matrix.lsan-options || 'verbosity=0' }}:abort_on_error=1
-        QEMU_RUN: ${{ matrix.qemu-run }}
+        ASAN_OPTIONS: ${{ matrix.asan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        MSAN_OPTIONS: ${{ matrix.msan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        TSAN_OPTIONS: ${{ matrix.tsan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        LSAN_OPTIONS: ${{ matrix.lsan-options || 'verbosity=0' }}:abort_on_error=1:halt_on_error=1
+        UBSAN_OPTIONS: ${{ matrix.ubsan-options || 'verbosity=0' }}:print_stacktrace=1:abort_on_error=1:halt_on_error=1
 
-    - name: Upload coverage report
-      if: matrix.codecov && ( env.CODECOV_TOKEN_SECRET != '' || github.repository == 'zlib-ng/zlib-ng' )
+    - name: Generate coverage report
+      if: matrix.codecov
       shell: bash
       run: |
-        bash tools/codecov-upload.sh
+        python3 -u -m pip install --user gcovr==5.0
+        python3 -m gcovr --exclude-unreachable-branches --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" --root ${{ matrix.build-src-dir || '.' }} --xml --output coverage.xml -j 3 --verbose
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v2
+      if: matrix.codecov && (env.CODECOV_TOKEN != '' || github.repository == 'zlib-ng/zlib-ng')
+      with:
+        token: ${{ secrets.CODECOV_TOKEN || 'e4fdf847-f541-4ab1-9d50-3d27e5913906' }}
+        flags: ${{ matrix.codecov }}
+        name: ${{ matrix.name }}
+        directory: ${{ matrix.build-src-dir || '.' }}
+        verbose: true
+        fail_ci_if_error: true
       env:
-        # Codecov does not yet support GitHub Actions
-        CODECOV_TOKEN_SECRET: "${{secrets.CODECOV_TOKEN}}"
-        CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN || 'e4fdf847-f541-4ab1-9d50-3d27e5913906' }}"
-        CODECOV_FLAGS: "${{ matrix.codecov }}"
-        CODECOV_NAME:  "${{ matrix.name }}"
-        CODECOV_EXEC:  "${{ matrix.gcov-exec || 'gcov' }}"
-        CODECOV_DIR:   "${{ matrix.build-dir || '.' }}"
+        CODECOV_TOKEN: "${{secrets.CODECOV_TOKEN}}"
 
     - name: Upload build errors
       uses: actions/upload-artifact@v2
@@ -439,6 +508,8 @@ jobs:
       with:
         name: ${{ matrix.name }} (cmake)
         path: |
-          ${{ matrix.build-dir || '.' }}/CMakeFiles/CMakeOutput.log
-          ${{ matrix.build-dir || '.' }}/CMakeFiles/CMakeError.log
+          **/CMakeFiles/CMakeOutput.log
+          **/CMakeFiles/CMakeError.log
+          **/Testing/Temporary/*
+          coverage.xml
         retention-days: 30
diff --git a/src/zlib-ng/.github/workflows/configure.yml b/src/zlib-ng/.github/workflows/configure.yml
index c3bc867..25d9b87 100644
--- a/src/zlib-ng/.github/workflows/configure.yml
+++ b/src/zlib-ng/.github/workflows/configure.yml
@@ -13,8 +13,8 @@ jobs:
             compiler: gcc
             configure-args: --warn
 
-          - name: Ubuntu 16.04 GCC
-            os: ubuntu-16.04
+          - name: Ubuntu 18.04 GCC
+            os: ubuntu-18.04
             compiler: gcc
             configure-args: --warn
 
@@ -120,6 +120,14 @@ jobs:
             cflags: -static
             ldflags: -static
 
+          - name: Ubuntu GCC PPC No Power8
+            os: ubuntu-latest
+            compiler: powerpc-linux-gnu-gcc
+            configure-args: --warn --without-power8
+            chost: powerpc-linux-gnu
+            packages: qemu qemu-user gcc-powerpc-linux-gnu libc-dev-powerpc-cross
+            qemu-run: qemu-ppc
+
           - name: Ubuntu GCC PPC64
             os: ubuntu-latest
             compiler: powerpc64-linux-gnu-gcc
@@ -148,25 +156,35 @@ jobs:
             cflags: -static
             ldflags: -static
 
-          - name: Ubuntu GCC S390X DFLTCC
+          - name: Ubuntu GCC S390X No vectorized CRC32
             os: ubuntu-latest
             compiler: s390x-linux-gnu-gcc
-            configure-args: --warn --static --with-dfltcc-deflate --with-dfltcc-inflate
+            configure-args: --warn --static --without-crc32-vx
             chost: s390x-linux-gnu
             packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
             qemu-run: qemu-s390x
             cflags: -static
             ldflags: -static
 
+          - name: Ubuntu GCC S390X DFLTCC
+            os: z15
+            compiler: gcc
+            configure-args: --warn --static --with-dfltcc-deflate --with-dfltcc-inflate
+
           - name: Ubuntu GCC S390X DFLTCC Compat
-            os: ubuntu-latest
-            compiler: s390x-linux-gnu-gcc
+            os: z15
+            compiler: gcc
             configure-args: --warn --zlib-compat --static --with-dfltcc-deflate --with-dfltcc-inflate
-            chost: s390x-linux-gnu
-            packages: qemu qemu-user gcc-s390x-linux-gnu libc-dev-s390x-cross
-            qemu-run: qemu-s390x
-            cflags: -static
-            ldflags: -static
+
+          - name: macOS GCC Symbol Prefix
+            os: macOS-latest
+            compiler: gcc
+            configure-args: --sprefix=zTest_
+
+          - name: macOS GCC Symbol Prefix & Compat
+            os: macOS-latest
+            compiler: gcc
+            configure-args: --zlib-compat --sprefix=zTest_
 
           - name: macOS GCC
             os: macOS-latest
@@ -175,7 +193,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux' && matrix.packages
@@ -206,6 +224,9 @@ jobs:
         make test
       env:
         QEMU_RUN: ${{ matrix.qemu-run }}
+        ASAN_OPTIONS: abort_on_error=1:halt_on_error=1
+        MSAN_OPTIONS: abort_on_error=1:halt_on_error=1
+        UBSAN_OPTIONS: print_stacktrace=1:abort_on_error=1:halt_on_error=1
 
     - name: Upload build errors
       uses: actions/upload-artifact@v2
diff --git a/src/zlib-ng/.github/workflows/fuzz.yml b/src/zlib-ng/.github/workflows/fuzz.yml
index e7ddaea..cd64708 100644
--- a/src/zlib-ng/.github/workflows/fuzz.yml
+++ b/src/zlib-ng/.github/workflows/fuzz.yml
@@ -1,5 +1,15 @@
 name: CI Fuzz
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches:
+      - stable
+      - develop
+      - pre-release
+      - '2.*'
+    tags:
+      - '*'
+
 jobs:
   Fuzzing:
     runs-on: ubuntu-latest
diff --git a/src/zlib-ng/.github/workflows/libpng.yml b/src/zlib-ng/.github/workflows/libpng.yml
index fe970dd..a519460 100644
--- a/src/zlib-ng/.github/workflows/libpng.yml
+++ b/src/zlib-ng/.github/workflows/libpng.yml
@@ -1,5 +1,5 @@
 name: CI Libpng
-on: [pull_request]
+on: [push, pull_request]
 jobs:
   pngtest:
     name: Ubuntu Clang
@@ -7,7 +7,7 @@ jobs:
 
     steps:
     - name: Checkout repository (zlib-ng)
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Generate project files (zlib-ng)
       run: |
diff --git a/src/zlib-ng/.github/workflows/nmake.yml b/src/zlib-ng/.github/workflows/nmake.yml
index 38c0b42..dcc1e73 100644
--- a/src/zlib-ng/.github/workflows/nmake.yml
+++ b/src/zlib-ng/.github/workflows/nmake.yml
@@ -9,40 +9,58 @@ jobs:
       matrix:
         include:
           - name: Windows NMake x86
-            os: windows-latest
+            os: windows-2022
             makefile: win32/Makefile.msc
             vc-vars: x86
 
+          - name: Windows NMake x64 compat
+            os: windows-2022
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: ZLIB_COMPAT=yes
+
+          - name: Windows NMake x64 Symbol Prefix
+            os: windows-2022
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: SYMBOL_PREFIX=zTest_
+
+          - name: Windows NMake x64 Symbol Prefix Compat
+            os: windows-2022
+            makefile: win32/Makefile.msc
+            vc-vars: x86_amd64
+            additional-args: ZLIB_COMPAT=yes SYMBOL_PREFIX=zTest_
+
           - name: Windows NMake x64
-            os: windows-latest
+            os: windows-2022
             makefile: win32/Makefile.msc
             vc-vars: x86_amd64
 
           - name: Windows NMake ARM No Test
-            os: windows-latest
+            os: windows-2022
             makefile: win32/Makefile.arm
             vc-vars: x86_arm
 
           - name: Windows NMake ARM64 No Test
-            os: windows-latest
+            os: windows-2022
             makefile: win32/Makefile.a64
             vc-vars: x86_arm64
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Compile source code
       shell: cmd
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
-        nmake -f ${{ matrix.makefile }}
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }}
 
     - name: Run test cases
       shell: cmd
       # Don't run tests on Windows ARM
       if: contains(matrix.vc-vars, 'arm') == false
       run: |
-        call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
-        nmake -f ${{ matrix.makefile }} test
-        nmake -f ${{ matrix.makefile }} testdll
+        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.vc-vars }}
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }} test
+        nmake -f ${{ matrix.makefile }} ${{ matrix.additional-args }} testdll
diff --git a/src/zlib-ng/.github/workflows/pigz.yml b/src/zlib-ng/.github/workflows/pigz.yml
new file mode 100644
index 0000000..e7193ee
--- /dev/null
+++ b/src/zlib-ng/.github/workflows/pigz.yml
@@ -0,0 +1,116 @@
+name: CI Pigz
+on: [push, pull_request]
+jobs:
+  ci-cmake:
+    name: ${{ matrix.name }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: Ubuntu GCC
+            os: ubuntu-latest
+            compiler: gcc
+            codecov: ubuntu_gcc_pigz
+
+          - name: Ubuntu GCC Symbol Prefix
+            os: ubuntu-latest
+            compiler: gcc
+            codecov: ubuntu_gcc_pigz
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+
+          - name: Ubuntu Clang
+            os: ubuntu-latest
+            compiler: clang
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
+            codecov: ubuntu_clang_pigz
+
+          - name: Ubuntu Clang No Optim
+            os: ubuntu-latest
+            compiler: clang
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
+            codecov: ubuntu_clang_pigz_no_optim
+            cmake-args: -DWITH_OPTIM=OFF
+
+            # Use v2.6 due to NOTHREADS bug https://github.com/madler/pigz/issues/97
+          - name: Ubuntu Clang No Threads
+            os: ubuntu-latest
+            compiler: clang
+            packages: llvm-11-tools
+            gcov-exec: llvm-cov-11 gcov
+            codecov: ubuntu_clang_pigz_no_threads
+            cmake-args: -DWITH_THREADS=OFF -DPIGZ_VERSION=v2.6
+
+          - name: Ubuntu GCC AARCH64
+            os: ubuntu-latest
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=../../cmake/toolchain-aarch64.cmake
+            packages: qemu qemu-user gcc-aarch64-linux-gnu libc-dev-arm64-cross
+            codecov: ubuntu_gcc_pigz_aarch64
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Checkout test corpora
+      uses: actions/checkout@v2
+      with:
+        repository: zlib-ng/corpora
+        path: test/data/corpora
+
+    - name: Install packages (Ubuntu)
+      if: runner.os == 'Linux' && matrix.packages
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y ${{ matrix.packages }}
+
+    - name: Generate project files
+      run: |
+        cd test/pigz
+        cmake ${{ matrix.cmake-args }} -DCMAKE_BUILD_TYPE=${{ matrix.build-config || 'Release' }} -DBUILD_SHARED_LIBS=OFF -DZLIB_ROOT=../.. -DWITH_CODE_COVERAGE=ON -DWITH_MAINTAINER_WARNINGS=ON
+      env:
+        CC: ${{ matrix.compiler }}
+        CFLAGS: ${{ matrix.cflags }}
+        LDFLAGS: ${{ matrix.ldflags }}
+        CI: true
+
+    - name: Compile source code
+      run: |
+        cd test/pigz
+        cmake --build . --config ${{ matrix.build-config || 'Release' }}
+
+    - name: Run test cases
+      run: |
+        cd test/pigz
+        ctest --verbose -C Release --output-on-failure --max-width 120 -j ${{ matrix.parallels-jobs || '2' }}
+
+    - name: Generate coverage report
+      if: matrix.codecov
+      run: |
+        python3 -u -m pip install --user gcovr==5.0
+        python3 -m gcovr --exclude-unreachable-branches --gcov-executable "${{ matrix.gcov-exec || 'gcov' }}" --root . --xml --output coverage.xml -j 3 --verbose
+
+    - name: Upload coverage report
+      uses: codecov/codecov-action@v2
+      if: matrix.codecov && (env.CODECOV_TOKEN != '' || github.repository == 'zlib-ng/zlib-ng')
+      with:
+        token: ${{ secrets.CODECOV_TOKEN || 'e4fdf847-f541-4ab1-9d50-3d27e5913906' }}
+        flags: ${{ matrix.codecov }}
+        name: ${{ matrix.name }}
+        verbose: true
+        fail_ci_if_error: true
+      env:
+        CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}
+
+    - name: Upload build errors
+      uses: actions/upload-artifact@v2
+      if: failure()
+      with:
+        name: ${{ matrix.name }} (cmake)
+        path: |
+          **/CMakeFiles/CMakeOutput.log
+          **/CMakeFiles/CMakeError.log
+          **/Testing/Temporary/*
+          coverage.xml
+        retention-days: 30
diff --git a/src/zlib-ng/.github/workflows/pkgcheck.yml b/src/zlib-ng/.github/workflows/pkgcheck.yml
index c74e41a..1c4b1dc 100644
--- a/src/zlib-ng/.github/workflows/pkgcheck.yml
+++ b/src/zlib-ng/.github/workflows/pkgcheck.yml
@@ -11,56 +11,72 @@ jobs:
           - name: Ubuntu GCC
             os: ubuntu-latest
             compiler: gcc
+            cxx-compiler: g++
 
           - name: Ubuntu GCC -m32
             os: ubuntu-latest
             compiler: gcc
-            packages: gcc-multilib
-            cmake-args: -DCMAKE_C_FLAGS=-m32
+            cxx-compiler: g++
+            packages: gcc-multilib g++-multilib
+            cmake-args: -DCMAKE_C_FLAGS=-m32 -DCMAKE_CXX_FLAGS=-m32
             cflags: -m32
+            cxxflags: -m32
             ldflags: -m32
 
           - name: Ubuntu GCC ARM HF
             os: ubuntu-latest
             chost: arm-linux-gnueabihf
             compiler: arm-linux-gnueabihf-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-arm.cmake -DCMAKE_C_COMPILER_TARGET=arm-linux-gnueabihf
-            packages: qemu gcc-arm-linux-gnueabihf libc6-dev-armhf-cross
+            cxx-compiler: g++-arm-linux-gnueabihf
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-armhf.cmake
+            packages: qemu gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libc6-dev-armhf-cross
 
           - name: Ubuntu GCC AARCH64
             os: ubuntu-latest
             chost: aarch64-linux-gnu
             compiler: aarch64-linux-gnu-gcc
+            cxx-compiler: g++-aarch64-linux-gnu
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-aarch64.cmake
-            packages: qemu gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+            packages: qemu gcc-aarch64-linux-gnu g++-aarch64-linux-gnu libc6-dev-arm64-cross
 
           - name: Ubuntu GCC PPC
             os: ubuntu-latest
             chost: powerpc-linux-gnu
             compiler: powerpc-linux-gnu-gcc
+            cxx-compiler: g++-powerpc-linux-gnu
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake
-            packages: qemu gcc-powerpc-linux-gnu libc6-dev-powerpc-cross
+            packages: qemu gcc-powerpc-linux-gnu g++-powerpc-linux-gnu libc6-dev-powerpc-cross
 
           - name: Ubuntu GCC PPC64LE
             os: ubuntu-latest
             chost: powerpc64le-linux-gnu
             compiler: powerpc64le-linux-gnu-gcc
+            cxx-compiler: g++-powerpc64le-linux-gnu
             cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake
-            packages: qemu gcc-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
+            packages: qemu gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu libc6-dev-ppc64el-cross
 
           - name: macOS Clang
             os: macOS-latest
             compiler: clang
+            cxx-compiler: clang++
 
           - name: macOS Clang Native
             os: macOS-latest
             compiler: clang
+            cxx-compiler: clang++
             cmake-args: -DWITH_NATIVE_INSTRUCTIONS=ON
             configure-args: --native
 
+          - name: macOS Clang Symbol Prefix
+            os: macOS-latest
+            compiler: clang
+            cxx-compiler: clang++
+            cmake-args: -DZLIB_SYMBOL_PREFIX=zTest_
+            configure-args: --sprefix=zTest_
+
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Install packages (Ubuntu)
       if: runner.os == 'Linux'
@@ -82,14 +98,16 @@ jobs:
       if: runner.os == 'macOS'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '12.1.1'
+        xcode-version: '11.7.0'
 
     - name: Compare builds
       run: |
         sh test/pkgcheck.sh
       env:
         CC: ${{ matrix.compiler }}
+        CXX: ${{ matrix.cxx-compiler }}
         CFLAGS: ${{ matrix.cflags }}
+        CXXFLAGS: ${{ matrix.cxxflags }}
         CHOST: ${{ matrix.chost }}
         CMAKE_ARGS: ${{ matrix.cmake-args }}
         CONFIGURE_ARGS: ${{ matrix.configure-args }}
@@ -110,10 +128,12 @@ jobs:
       # macOS runner does not contain abigail
       if: runner.os != 'macOS'
       run: |
-        sh test/abicheck.sh --refresh_if
+        sh test/abicheck.sh --refresh-if
       env:
         CC: ${{ matrix.compiler }}
+        CXX: ${{ matrix.cxx-compiler }}
         CFLAGS: ${{ matrix.cflags }}
+        CXXFLAGS: ${{ matrix.cxxflags }}
         CHOST: ${{ matrix.chost }}
         CMAKE_ARGS: ${{ matrix.cmake-args }}
         CONFIGURE_ARGS: ${{ matrix.configure-args }}
@@ -123,10 +143,12 @@ jobs:
       # macOS runner does not contain abigail
       if: runner.os != 'macOS'
       run: |
-        sh test/abicheck.sh --zlib-compat --refresh_if
+        sh test/abicheck.sh --zlib-compat --refresh-if
       env:
         CC: ${{ matrix.compiler }}
+        CXX: ${{ matrix.cxx-compiler }}
         CFLAGS: ${{ matrix.cflags }}
+        CXXFLAGS: ${{ matrix.cxxflags }}
         CHOST: ${{ matrix.chost }}
         CMAKE_ARGS: ${{ matrix.cmake-args }}
         CONFIGURE_ARGS: ${{ matrix.configure-args }}
diff --git a/src/zlib-ng/.github/workflows/release.yml b/src/zlib-ng/.github/workflows/release.yml
index f07f431..e52d6a6 100644
--- a/src/zlib-ng/.github/workflows/release.yml
+++ b/src/zlib-ng/.github/workflows/release.yml
@@ -61,7 +61,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
 
     - name: Set environment variables
       shell: bash