From: Nathan Moinvaziri <nathan@nathanm.com>
Date: Thu, 2 Jul 2020 01:39:22 +0000 (-0700)
Subject: Added powerpc instances to CI for configure.
X-Git-Tag: 1.9.9-b1~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd4e59cb7f6fc5ad666bcd7f76a4e77ed96781b2;p=thirdparty%2Fzlib-ng.git

Added powerpc instances to CI for configure.
---

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 4820614a..1d2b0811 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -24,11 +24,11 @@ jobs:
           Ubuntu GCC ARM HF Compat No Opt,
           Ubuntu GCC AARCH64,
           Ubuntu GCC AARCH64 Compat No Opt,
-          Ubuntu GCC PPC Compat,
-          Ubuntu GCC PPC64 Compat,
-          Ubuntu GCC PPC64LE Compat,
-          Ubuntu GCC SPARC64 Compat,
-          Ubuntu GCC S390X Compat,
+          Ubuntu GCC PPC,
+          Ubuntu GCC PPC64,
+          Ubuntu GCC PPC64LE,
+          Ubuntu GCC SPARC64,
+          Ubuntu GCC S390X,
           Ubuntu Clang,
           Ubuntu Clang Inflate Strict,
           Ubuntu Clang Inflate Allow Invalid Dist,
@@ -153,45 +153,44 @@ jobs:
             packages: qemu gcc-aarch64-linux-gnu libc-dev-arm64-cross
             codecov: ubuntu_gcc_aarch64_compat_no_opt
 
-          - name: Ubuntu GCC PPC Compat
+          - name: Ubuntu GCC PPC
             os: ubuntu-latest
             compiler: powerpc-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake -DZLIB_COMPAT=ON
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc.cmake
             packages: qemu gcc-powerpc-linux-gnu libc-dev-powerpc-cross
-            codecov: ubuntu_gcc_ppc_compat
+            ldflags: -static
+            codecov: ubuntu_gcc_ppc
 
-            cflags: -static
-          - name: Ubuntu GCC PPC64 Compat
+          - name: Ubuntu GCC PPC64
             os: ubuntu-latest
             compiler: powerpc64-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64.cmake -DZLIB_COMPAT=ON
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64.cmake
             packages: qemu gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
-            cflags: -static
-            codecov: ubuntu_gcc_ppc64_compat
+            ldflags: -static
+            codecov: ubuntu_gcc_ppc64
 
-          - name: Ubuntu GCC PPC64LE Compat
+          - name: Ubuntu GCC PPC64LE
             os: ubuntu-latest
             compiler: powerpc64le-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake -DZLIB_COMPAT=ON
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-powerpc64le.cmake
             packages: qemu gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
-            cflags: -static
-            codecov: ubuntu_gcc_ppc64le_compat
+            codecov: ubuntu_gcc_ppc64le
 
-          - name: Ubuntu GCC SPARC64 Compat
+          - name: Ubuntu GCC SPARC64
             os: ubuntu-latest
             compiler: sparc64-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-sparc64.cmake -DZLIB_COMPAT=ON
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-sparc64.cmake
             packages: qemu gcc-sparc64-linux-gnu libc-dev-sparc64-cross
-            cflags: -static
-            codecov: ubuntu_gcc_sparc64_compat
+            ldflags: -static
+            codecov: ubuntu_gcc_sparc64
 
-          - name: Ubuntu GCC S390X Compat
+          - name: Ubuntu GCC S390X
             os: ubuntu-latest
             compiler: s390x-linux-gnu-gcc
-            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake -DZLIB_COMPAT=ON
+            cmake-args: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchain-s390x.cmake
             packages: qemu gcc-s390x-linux-gnu libc-dev-s390x-cross
-            cflags: -static
-            codecov: ubuntu_gcc_s390x_compat
+            ldflags: -static
+            codecov: ubuntu_gcc_s390x
 
           - name: Ubuntu Clang
             os: ubuntu-latest
diff --git a/.github/workflows/configure.yml b/.github/workflows/configure.yml
index 55d669e3..29259f82 100644
--- a/.github/workflows/configure.yml
+++ b/.github/workflows/configure.yml
@@ -18,6 +18,9 @@ jobs:
           Ubuntu GCC ARM HF Compat No Opt,
           Ubuntu GCC AARCH64,
           Ubuntu GCC AARCH64 Compat No Opt,
+          Ubuntu GCC PPC,
+          Ubuntu GCC PPC64,
+          Ubuntu GCC PPC64LE,
           macOS GCC
         ]
         include:
@@ -87,6 +90,31 @@ jobs:
             chost: aarch64-linux-gnu
             packages: qemu gcc-aarch64-linux-gnu libc-dev-arm64-cross
 
+          - name: Ubuntu GCC PPC
+            os: ubuntu-latest
+            compiler: powerpc-linux-gnu-gcc
+            configure-args: --warn --static
+            chost: powerpc-linux-gnu
+            packages: qemu gcc-powerpc-linux-gnu libc-dev-powerpc-cross
+            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 gcc-powerpc64-linux-gnu libc-dev-ppc64-cross
+            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 gcc-powerpc64le-linux-gnu libc-dev-ppc64el-cross
+
           - name: macOS GCC
             os: macOS-latest
             compiler: gcc
@@ -109,6 +137,8 @@ jobs:
         ${{ matrix.build-src-dir || '.' }}/configure ${{ matrix.configure-args }}
       env:
         CC: ${{ matrix.compiler }}
+        CFLAGS: ${{ matrix.cflags }}
+        LDFLAGS: ${{ matrix.ldflags }}
         CHOST: ${{ matrix.chost }}
         CI: true
 
diff --git a/configure b/configure
index 53fc6844..14a41526 100755
--- a/configure
+++ b/configure
@@ -1390,14 +1390,13 @@ case "${ARCH}" in
 
         if test $without_optimizations -eq 0; then
             if test $HAVE_POWER8 -eq 1; then
+                CFLAGS="${CFLAGS} -DPOWER8 -DPOWER_FEATURES -DPOWER8_VSX_ADLER32 -DPOWER8_VSX_SLIDEHASH"
+                SFLAGS="${SFLAGS} -DPOWER8 -DPOWER_FEATURES -DPOWER8_VSX_ADLER32 -DPOWER8_VSX_SLIDEHASH"
+
                 ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} adler32_power8.o power.o slide_hash_power8.o"
                 ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} adler32_power8.lo power.lo slide_hash_power8.lo"
-                POWERFLAGS="-DPOWER8 -DPOWER_FEATURES -DPOWER8_VSX_ADLER32 -DPOWER8_VSX_SLIDEHASH"
             fi
         fi
-
-        CFLAGS="${CFLAGS} ${POWERFLAGS}"
-        SFLAGS="${SFLAGS} ${POWERFLAGS}"
     ;;
     s390x)
         [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=s390x