diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-06-30 18:01:25 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2014-07-07 03:51:54 +0200 |
| commit | 9eceb21d62b4bff779144946074b132408766677 (patch) | |
| tree | 0f236263a61e268ddac676a260d76a9aa37a1a3d /src | |
| parent | 2fe90a61bdf16bb1a08817ba544e2309b524a052 (diff) | |
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 <kai.koehne@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/archdetect.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
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 |