diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-09-07 12:31:14 (GMT) |
| commit | 30cf45cf53e030158fef4dfb262e7444332d3138 (patch) | |
| tree | 3bfe9133feb8d1505b6e394e791a348cdf4d475f /src/corelib/tools | |
| parent | d52f0887a740d147a74c3e38ae587f688fbf896a (diff) | |
| parent | 3505c6cdcdfac5a6d0f4b94dbdbcc8ad72f8048a (diff) | |
| download | Qt-30cf45cf53e030158fef4dfb262e7444332d3138.zip Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.gz Qt-30cf45cf53e030158fef4dfb262e7444332d3138.tar.bz2 | |
Merge branch '4.7-oslo1' into 4.7-doc
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 7349432..a9c33f1 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -54,8 +54,20 @@ #if defined(Q_OS_LINUX) && defined(__arm__) #include "private/qcore_unix_p.h" -#include <asm/hwcap.h> -#include <linux/auxvec.h> +// the kernel header definitions for HWCAP_* +// (the ones we need/may need anyway) + +// copied from <asm/hwcap.h> (ARM) +#define HWCAP_IWMMXT 512 +#define HWCAP_CRUNCH 1024 +#define HWCAP_THUMBEE 2048 +#define HWCAP_NEON 4096 +#define HWCAP_VFPv3 8192 +#define HWCAP_VFPv3D16 16384 + +// copied from <linux/auxvec.h> +#define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */ + #endif QT_BEGIN_NAMESPACE |