From 1b12c0608be2359baa2f96ae28b135a84abd388c Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 8 Dec 2013 19:58:37 -0800 Subject: Remove runtime detection of Neon on ARM CPUs Now the only way to enable Neon support is to change the mkspec. [ChangeLog][Important Behavior Changes] Qt no longer checks for support for the Neon FPU on ARM platforms at runtime. Code optimized for Neon must be enabled unconditionally at compile time by ensuring the compiler supports Neon. You may need to edit your mkspec for that. Task-number: QTBUG-30440 Change-Id: I4df9b2bf3cd022f8ed70f02f16878cb2cb3fe6fb Reviewed-by: Lars Knoll --- config.tests/unix/neon/neon.cpp | 51 ----------------------------------------- config.tests/unix/neon/neon.pro | 4 ---- 2 files changed, 55 deletions(-) delete mode 100644 config.tests/unix/neon/neon.cpp delete mode 100644 config.tests/unix/neon/neon.pro (limited to 'config.tests') diff --git a/config.tests/unix/neon/neon.cpp b/config.tests/unix/neon/neon.cpp deleted file mode 100644 index ccbb476367..0000000000 --- a/config.tests/unix/neon/neon.cpp +++ /dev/null @@ -1,51 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the config.tests of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, 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, Digia gives you certain additional -** rights. These rights are described in the Digia 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. -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include - -int main(int, char**) -{ - int32x4_t null = vdupq_n_s32(0x0); - - int result; - vst1q_lane_s32(&result, null, 0); - return result; -} diff --git a/config.tests/unix/neon/neon.pro b/config.tests/unix/neon/neon.pro deleted file mode 100644 index efd608bd63..0000000000 --- a/config.tests/unix/neon/neon.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = neon.cpp -CONFIG -= x11 qt -isEmpty(QMAKE_CFLAGS_NEON):error("This compiler does not support Neon") -else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_NEON -- cgit v1.2.3