From 9eceb21d62b4bff779144946074b132408766677 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Mon, 30 Jun 2014 18:01:25 -0700 Subject: Add missing detection for some 64-bit architectures Architectures missing were arm64, mips64, power64, s390x and sparcv9 (sparc64, but we're using the name that matches the Q_PROCESSOR_xxx define, which in turn matches Solaris's psrinfo output). Change-Id: I50b8152b3c42589b98db157b9efeae2be6a90414 Reviewed-by: Kai Koehne Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen Reviewed-by: Thiago Macieira --- src/corelib/global/archdetect.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp index 4697db52bb..9540e391ba 100644 --- a/src/corelib/global/archdetect.cpp +++ b/src/corelib/global/archdetect.cpp @@ -45,8 +45,10 @@ // main part: processor type #if defined(Q_PROCESSOR_ALPHA) # define ARCH_PROCESSOR "alpha" -#elif defined(Q_PROCESSOR_ARM) +#elif defined(Q_PROCESSOR_ARM_32) # define ARCH_PROCESSOR "arm" +#elif defined(Q_PROCESSOR_ARM_64) +# define ARCH_PROCESSOR "arm64" #elif defined(Q_PROCESSOR_AVR32) # define ARCH_PROCESSOR "avr32" #elif defined(Q_PROCESSOR_BLACKFIN) @@ -57,14 +59,22 @@ # define ARCH_PROCESSOR "x86_64" #elif defined(Q_PROCESSOR_IA64) # define ARCH_PROCESSOR "ia64" +#elif defined(Q_PROCESSOR_MIPS_64) +# define ARCH_PROCESSOR "mips64" #elif defined(Q_PROCESSOR_MIPS) # define ARCH_PROCESSOR "mips" -#elif defined(Q_PROCESSOR_POWER) +#elif defined(Q_PROCESSOR_POWER_32) # define ARCH_PROCESSOR "power" +#elif defined(Q_PROCESSOR_POWER_64) +# define ARCH_PROCESSOR "power64" +#elif defined(Q_PROCESSOR_S390_X) +# define ARCH_PROCESSOR "s390x" #elif defined(Q_PROCESSOR_S390) # define ARCH_PROCESSOR "s390" #elif defined(Q_PROCESSOR_SH) # define ARCH_PROCESSOR "sh" +#elif defined(Q_PROCESSOR_SPARC_V9) +# define ARCH_PROCESSOR "sparcv9" #elif defined(Q_PROCESSOR_SPARC) # define ARCH_PROCESSOR "sparc" #else -- cgit v1.2.3