Add qprocessordetection.h

This detects the target processor based on preprocessor #defines,
setting Q_PROCESSOR_${FAMILY} accordingly. Optional
Q_PROCESSOR_${FAMILY}_${REVISION/VARIANT} #defines are also provided,
usually dependent on how the compiler is invoked.

Currently detected families (and variants) include:

ARM (v5, v6, and v7)
X86 (i386 and x86_64, as X86_32 and X86_64 respectively)
IA-64
MIPS (I, II, III, IV, 32, 64)

Other families that currently are not detected, but Qt has (or had)
support for include:

Alpha
AVR32
Blackfin
PA-RISC
PowerPC (optional 64-bit variant)
S390 (and S390X 64-bit variant)
SH (and SH-4A)
SPARC (SPARC V9)

Detection for these is currently commented out, and can
be easily enabled later.

Change-Id: I571f245c189b9d80c7c3a5369ac595a271f37c8b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index e00917c..726a566 100644 (file)
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -4,6 +4,7 @@ HEADERS +=  \
        global/qglobal.h \
         global/qsystemdetection.h \
         global/qcompilerdetection.h \
+        global/qprocessordetection.h \
        global/qnamespace.h \
         global/qendian.h \
         global/qnumeric_p.h \

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 7ac212b..f0d902f 100644 (file)
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -64,6 +64,7 @@
 
 #include <QtCore/qsystemdetection.h>
 #include <QtCore/qcompilerdetection.h>
+#include <QtCore/qprocessordetection.h>
 
 #ifdef __cplusplus
 

diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h
new file mode 100644 (file)
index 0000000..2d52847
--- /dev/null
+++ b/src/corelib/global/qprocessordetection.h
@@ -0,0 +1,194 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QPROCESSORDETECTION_H
+#define QPROCESSORDETECTION_H
+
+/*
+    This file uses preprocessor #defines to set various Q_PROCESSOR_* #defines
+    based on the following patterns:
+
+    Q_PROCESSOR_{FAMILY}
+    Q_PROCESSOR_{FAMILY}_{VARIANT}
+    Q_PROCESSOR_{FAMILY}_{REVISION}
+
+    The first is always defined. Defines for the various revisions/variants are
+    optional and usually dependent on how the compiler was invoked. Variants
+    that are a superset of another should have a define for the superset.
+*/
+
+/*
+    Alpha family, no revisions or variants
+*/
+// #elif defined(__alpha__) || defined(_M_ALPHA)
+// #  define Q_PROCESSOR_ALPHA
+
+/*
+  ARM family, known revisions: V5, V6, and V7
+*/
+#if defined(__arm__) || defined(__TARGET_ARCH_ARM)
+#  define Q_PROCESSOR_ARM
+#  if defined(__ARM_ARCH_7__) \
+      || defined(__ARM_ARCH_7A__) \
+      || defined(__ARM_ARCH_7R__) \
+      || defined(__ARM_ARCH_7M__) \
+      || (__TARGET_ARCH_ARM-0 >= 7)
+#    define Q_PROCESSOR_ARM_V7
+#    define Q_PROCESSOR_ARM_V6
+#    define Q_PROCESSOR_ARM_V5
+#  elif defined(__ARM_ARCH_6__) \
+      || defined(__ARM_ARCH_6J__) \
+      || defined(__ARM_ARCH_6T2__) \
+      || defined(__ARM_ARCH_6Z__) \
+      || defined(__ARM_ARCH_6K__) \
+      || defined(__ARM_ARCH_6ZK__) \
+      || defined(__ARM_ARCH_6M__) \
+      || (__TARGET_ARCH_ARM-0 >= 6)
+#    define Q_PROCESSOR_ARM_V6
+#    define Q_PROCESSOR_ARM_V5
+#  elif defined(__ARM_ARCH_5TEJ__) \
+        || (__TARGET_ARCH_ARM-0 >= 5)
+#    define Q_PROCESSOR_ARM_V5
+#  else
+#    error "Unknown ARM processor detected."
+#  endif
+
+/*
+    AVR32 family, no revisions or variants
+*/
+// #elif defined(__avr32__)
+// #  define Q_PROCESSOR_AVR32
+
+/*
+    Blackfin family, no revisions or variants
+*/
+// #elif defined(__bfin__)
+// #  define Q_PROCESSOR_BLACKFIN
+
+/*
+    X86 family, known variants: 32- and 64-bit
+*/
+#elif defined(__i386) || defined(__i386__) || defined(_M_IX86)
+#  define Q_PROCESSOR_X86
+#  define Q_PROCESSOR_X86_32
+#elif defined(__x86_64) || defined(__x86_64__) || defined(__amd64) || defined(_M_X64)
+#  define Q_PROCESSOR_X86
+#  define Q_PROCESSOR_X86_64
+
+/*
+    Itanium (IA-64) family, no revisions or variants
+*/
+#elif defined(__ia64) || defined(__ia64__) || defined(_M_IA64)
+#  define Q_PROCESSOR_IA64
+
+/*
+    MIPS family, known revisions: I, II, III, IV, 32, 64
+*/
+#elif defined(__mips) || defined(__mips__) || defined(_M_MRX000)
+#  define Q_PROCESSOR_MIPS
+#  if defined(_MIPS_ARCH_MIPS1) || (defined(__mips) && __mips - 0 >= 1)
+#    define Q_PROCESSOR_MIPS_I
+#  endif
+#  if defined(_MIPS_ARCH_MIPS2) || (defined(__mips) && __mips - 0 >= 2)
+#    define Q_PROCESSOR_MIPS_II
+#  endif
+#  if defined(_MIPS_ARCH_MIPS32) || defined(__mips32)
+#    define Q_PROCESSOR_MIPS_32
+#  endif
+#  if defined(_MIPS_ARCH_MIPS3) || (defined(__mips) && __mips - 0 >= 3)
+#    define Q_PROCESSOR_MIPS_III
+#  endif
+#  if defined(_MIPS_ARCH_MIPS4) || (defined(__mips) && __mips - 0 >= 4)
+#    define Q_PROCESSOR_MIPS_IV
+#  endif
+#  if defined(_MIPS_ARCH_MIPS64) || defined(__mips64)
+#    define Q_PROCESSOR_MIPS_64
+#  endif
+
+/*
+    PA-RISC family, no revisions or variants
+*/
+// #elif defined(__parisc__)
+// #  define Q_PROCESSOR_PARISC
+
+/*
+    POWER family, optional variant: 64-bit
+
+    There are many more known variants/revisions that we do not handle/detect.
+    See http://en.wikipedia.org/wiki/Power_Architecture
+    and http://en.wikipedia.org/wiki/File:PowerISA-evolution.svg
+*/
+// #elif defined(__powerpc__) || defined(__ppc__) || defined(_M_MPPC) || defined(_M_PPC)
+// #  define Q_PROCESSOR_POWERPC
+// #  if defined(__64BIT__) || defined(__powerpc64__) || defined(__ppc64__)
+// #    define Q_PROCESSOR_POWERPC_64
+// #  endif
+
+/*
+    S390 family, known variant: S390X (64-bit)
+*/
+// #elif defined(__s390__)
+// #  define Q_PROCESSOR_S390
+// #  if defined(__s390x__)
+// #    define Q_PROCESSOR_S390_X
+// #  endif
+
+/*
+    SuperH family, optional revision: SH-4A
+*/
+// #elif defined(__sh__)
+// #  define Q_PROCESSOR_SH
+// #  if defined(__sh4a__)
+// #    define Q_PROCESSOR_SH_4A
+// #  endif
+
+/*
+    SPARC family, optional revision: V9
+*/
+// #elif defined(__sparc__)
+// #  define Q_PROCESSOR_SPARC
+// #  if defined(__sparc_v9__)
+// #    define Q_PROCESSOR_SPARC_V9
+// #  endif
+
+#endif
+
+#endif // QPROCESSORDETECTION_H

diff --git a/sync.profile b/sync.profile
index 4f01b7c..cc681b0 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -77,7 +77,7 @@
 );
 
 @ignore_for_master_contents = ( "qt.h", "qpaintdevicedefs.h" );
-@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h" );
+@ignore_for_include_check = ( "qsystemdetection.h", "qcompilerdetection.h", "qprocessordetection.h" );
 @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qt_windows.h" );
 @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );