From 8ccba56756ef331fc3272ffc0de7e9e067c15063 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 1 Aug 2019 12:27:12 +0000 Subject: [PATCH] add HPPA (a.k.a. PA-RISC) architecture check Signed-off-by: Ivailo Monev --- mkspecs/mkspecs.cmake | 2 ++ src/core/global/qglobal.h.cmake | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake index 5c4e9a917..bd820f2f3 100644 --- a/mkspecs/mkspecs.cmake +++ b/mkspecs/mkspecs.cmake @@ -61,6 +61,8 @@ if(NOT KATIE_ARCHITECTURE) set(KATIE_ARCHITECTURE "m68k") elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") set(KATIE_ARCHITECTURE "mips") + elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") + set(KATIE_ARCHITECTURE "parisc") elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") set(KATIE_ARCHITECTURE "powerpc") elseif(LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^s390") diff --git a/src/core/global/qglobal.h.cmake b/src/core/global/qglobal.h.cmake index 55e2a6a07..d834be72b 100644 --- a/src/core/global/qglobal.h.cmake +++ b/src/core/global/qglobal.h.cmake @@ -70,7 +70,7 @@ M68K - ... MIPS - ... NACL - ... - !PARISC - ... + PARISC - ... POWERPC - ... S390 - ... SPARC - ... @@ -105,10 +105,12 @@ # define QT_ARCH_MIPS #elif defined(__native_client__) # define QT_ARCH_NACL -#elif defined(__s390__) -# define QT_ARCH_S390 +#elif defined(__hppa__) +# define QT_ARCH_PARISC #elif defined(__powerpc__) || defined(__powerpc64__) # define QT_ARCH_POWERPC +#elif defined(__s390__) +# define QT_ARCH_S390 #elif defined(__sparc__) # define QT_ARCH_SPARC #elif defined(__sh__) -- 2.11.0