From e5066a3a2eb965e64f6bf6e112739222574d66d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 16 Jan 2014 18:46:13 +0100 Subject: Remove last traces of QT_COMPILER_SUPPORTS_NEON Fixes ARM build, as the NEON drawhelpers and image conversion functions were ifdef'ed out. Follow-up to 1b12c0608be2359baa2f96ae28b135a84abd388c. Change-Id: I0b5e89c8f445741432db2dfe1f8d971b971c8605 Reviewed-by: Simon Hausmann Reviewed-by: Thiago Macieira --- configure | 2 +- src/corelib/global/qcompilerdetection.h | 1 - src/corelib/tools/qsimd.cpp | 4 ++-- src/gui/image/qimage_neon.cpp | 4 ++-- src/gui/image/qjpeghandler.cpp | 2 +- src/gui/painting/qdrawhelper_neon.cpp | 4 ++-- src/gui/painting/qdrawhelper_neon_p.h | 4 ++-- tools/configure/configureapp.cpp | 2 -- 8 files changed, 10 insertions(+), 13 deletions(-) diff --git a/configure b/configure index d14422becd..8fda890da5 100755 --- a/configure +++ b/configure @@ -6213,7 +6213,7 @@ fi echo "" >>"$outpath/src/corelib/global/qconfig.h.new" echo "// Compiler sub-arch support" >>"$outpath/src/corelib/global/qconfig.h.new" for SUBARCH in SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2 \ - IWMMXT NEON \ + IWMMXT \ MIPS_DSP MIPS_DSPR2; do eval "VAL=\$CFG_$SUBARCH" case "$VAL" in diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 70dddeba29..908800b317 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1018,7 +1018,6 @@ #endif #if !defined(Q_PROCESSOR_ARM) # undef QT_COMPILER_SUPPORTS_IWMMXT -# undef QT_COMPILER_SUPPORTS_NEON #endif #if !defined(Q_PROCESSOR_MIPS) # undef QT_COMPILER_SUPPORTS_MIPS_DSP diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 00c523afe6..bf801cfb13 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -54,7 +54,7 @@ # include # endif # endif -#elif defined(Q_OS_LINUX) && (defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) || defined(QT_COMPILER_SUPPORTS_NEON)) +#elif defined(Q_OS_LINUX) && (defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT)) #include "private/qcore_unix_p.h" // the kernel header definitions for HWCAP_* @@ -102,7 +102,7 @@ static inline uint detectProcessorFeatures() return features; } -#elif defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) || defined(QT_COMPILER_SUPPORTS_NEON) +#elif defined(Q_PROCESSOR_ARM) || defined(QT_COMPILER_SUPPORTS_IWMMXT) static inline uint detectProcessorFeatures() { uint features = 0; diff --git a/src/gui/image/qimage_neon.cpp b/src/gui/image/qimage_neon.cpp index 1ac0a87272..60c2da6a58 100644 --- a/src/gui/image/qimage_neon.cpp +++ b/src/gui/image/qimage_neon.cpp @@ -43,7 +43,7 @@ #include #include -#ifdef QT_COMPILER_SUPPORTS_NEON +#ifdef __ARM_NEON__ QT_BEGIN_NAMESPACE @@ -111,4 +111,4 @@ void convert_RGB888_to_RGB32_neon(QImageData *dest, const QImageData *src, Qt::I QT_END_NAMESPACE -#endif // QT_COMPILER_SUPPORTS_NEON +#endif // __ARM_NEON__ diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp index 5187f0e9b3..bd358b7228 100644 --- a/src/gui/image/qjpeghandler.cpp +++ b/src/gui/image/qjpeghandler.cpp @@ -866,7 +866,7 @@ QJpegHandler::QJpegHandler() if (qCpuHasFeature(NEON)) rgb888ToRgb32ConverterPtr = qt_convert_rgb888_to_rgb32_neon; -#endif // QT_COMPILER_SUPPORTS_NEON +#endif // __ARM_NEON__ #if defined(QT_COMPILER_SUPPORTS_SSSE3) // from qimage_ssse3.cpp diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp index 3ab445aa60..a40166d5be 100644 --- a/src/gui/painting/qdrawhelper_neon.cpp +++ b/src/gui/painting/qdrawhelper_neon.cpp @@ -43,7 +43,7 @@ #include #include -#ifdef QT_COMPILER_SUPPORTS_NEON +#ifdef __ARM_NEON__ #include #include @@ -998,5 +998,5 @@ const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Opera QT_END_NAMESPACE -#endif // QT_COMPILER_SUPPORTS_NEON +#endif // __ARM_NEON__ diff --git a/src/gui/painting/qdrawhelper_neon_p.h b/src/gui/painting/qdrawhelper_neon_p.h index 475df639f8..cad6fe22e9 100644 --- a/src/gui/painting/qdrawhelper_neon_p.h +++ b/src/gui/painting/qdrawhelper_neon_p.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE -#ifdef QT_COMPILER_SUPPORTS_NEON +#ifdef __ARM_NEON__ void qt_blend_argb32_on_argb32_neon(uchar *destPixels, int dbpl, const uchar *srcPixels, int sbpl, @@ -139,7 +139,7 @@ void QT_FASTCALL qt_destStoreRGB16_neon(QRasterBuffer *rasterBuffer, void QT_FASTCALL comp_func_solid_SourceOver_neon(uint *destPixels, int length, uint color, uint const_alpha); void QT_FASTCALL comp_func_Plus_neon(uint *dst, const uint *src, int length, uint const_alpha); -#endif // QT_COMPILER_SUPPORTS_NEON +#endif // __ARM_NEON__ QT_END_NAMESPACE diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c0f37feb25..e04bd57b7f 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3389,8 +3389,6 @@ void Configure::generateConfigfiles() tmpStream << "#define QT_COMPILER_SUPPORTS_AVX2" << endl; if (dictionary[ "IWMMXT" ] == "yes") tmpStream << "#define QT_COMPILER_SUPPORTS_IWMMXT" << endl; - if (dictionary[ "NEON" ] == "yes") - tmpStream << "#define QT_COMPILER_SUPPORTS_NEON" << endl; if (dictionary["QREAL"] != "double") tmpStream << "#define QT_COORD_TYPE " << dictionary["QREAL"] << endl; -- cgit v1.2.3