From: Matheus Castanho <msc@linux.ibm.com>
Date: Tue, 9 Jun 2020 18:25:16 +0000 (-0300)
Subject: cmake: Use consistent arch names for POWER targets
X-Git-Tag: 1.9.9-b1~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7fd60eb338e81c37c59b7a10ec1a964a43f851b;p=thirdparty%2Fzlib-ng.git

cmake: Use consistent arch names for POWER targets

The arch detection code used by cmake build exports ppc arch names in an
abbreviated way, e.g. ppc64le instead of powerpc64le. Some parts of
CMakeLists.txt are using the longer form instead, which will not
properly match the desired subarch as expected. Switch to using the
longer form everywhere for consistency with 'configure' script and with
arch names obtained when running under QEMU.
---

diff --git a/cmake/detect-arch.c b/cmake/detect-arch.c
index d7017d8b..57155358 100644
--- a/cmake/detect-arch.c
+++ b/cmake/detect-arch.c
@@ -35,12 +35,12 @@
 #elif defined(__powerpc__) || defined(_ppc__) || defined(__PPC__)
     #if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
         #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
-            #error archfound ppc64le
+            #error archfound powerpc64le
         #else 
-            #error archfound ppc64
+            #error archfound powerpc64
         #endif
     #else
-        #error archfound ppc
+        #error archfound powerpc
     #endif
 
 // --------------- Less common architectures alphabetically below ---------------