summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <holger@moiji-mobile.com>2012-07-20 21:03:56 +0800
committerQt by Nokia <qt-info@nokia.com>2012-09-01 15:28:24 +0200
commit08e92ba1e009d8b55e4ea44b4169ae80252b24f1 (patch)
treee63d10f54b6b8c0a54a6ddf7ec75fb0308ab1b8f /config.tests
parent5f5e9b0e042b6957e826c862a1faa6687cfee671 (diff)
mips: Autodetect MIPS DSP rev1 and rev2 instructionset
Not every MIPS SoC has the DSP extensions, auto-detect them by using builtin GCC functions. Check for the DSP macros and add the result for rev1 and rev2 to the cpufeatures. Change-Id: I3d6c950f170f102514c43b349f9a23ee796d801a Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/arch/arch.cpp7
-rw-r--r--config.tests/unix/mips_dsp/mips_dsp.cpp47
-rw-r--r--config.tests/unix/mips_dsp/mips_dsp.pro2
-rw-r--r--config.tests/unix/mips_dspr2/mips_dspr2.cpp49
-rw-r--r--config.tests/unix/mips_dspr2/mips_dspr2.pro2
5 files changed, 106 insertions, 1 deletions
diff --git a/config.tests/arch/arch.cpp b/config.tests/arch/arch.cpp
index e9530e63c6..c27e012925 100644
--- a/config.tests/arch/arch.cpp
+++ b/config.tests/arch/arch.cpp
@@ -229,7 +229,12 @@ const char msg2[] = "==Qt=magic=Qt== Sub-architecture:"
#endif
// -- MIPS --
-// Wikipedia says there are extensions, but GCC installs no headers
+# if __mips_dsp
+" dsp"
+# endif
+# if __mips_dspr2
+" dspr2"
+# endif
// -- POWER, PowerPC --
#ifdef __ALTIVEC__
diff --git a/config.tests/unix/mips_dsp/mips_dsp.cpp b/config.tests/unix/mips_dsp/mips_dsp.cpp
new file mode 100644
index 0000000000..78f318c9be
--- /dev/null
+++ b/config.tests/unix/mips_dsp/mips_dsp.cpp
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the config.tests 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$
+**
+****************************************************************************/
+
+int main(int, char**)
+{
+ int result;
+ __builtin_mips_lhx(&result, 10);
+ return result;
+}
diff --git a/config.tests/unix/mips_dsp/mips_dsp.pro b/config.tests/unix/mips_dsp/mips_dsp.pro
new file mode 100644
index 0000000000..428b106c46
--- /dev/null
+++ b/config.tests/unix/mips_dsp/mips_dsp.pro
@@ -0,0 +1,2 @@
+SOURCES = mips_dsp.cpp
+CONFIG -= x11 qt
diff --git a/config.tests/unix/mips_dspr2/mips_dspr2.cpp b/config.tests/unix/mips_dspr2/mips_dspr2.cpp
new file mode 100644
index 0000000000..55d7d56b19
--- /dev/null
+++ b/config.tests/unix/mips_dspr2/mips_dspr2.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the config.tests 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$
+**
+****************************************************************************/
+
+int main(int, char**)
+{
+ int result, tmp1, tmp2;
+ tmp1 = 10;
+ tmp2 = 20;
+ result = __builtin_mips_append (tmp1, tmp2, 10);
+ return result;
+}
diff --git a/config.tests/unix/mips_dspr2/mips_dspr2.pro b/config.tests/unix/mips_dspr2/mips_dspr2.pro
new file mode 100644
index 0000000000..a938742229
--- /dev/null
+++ b/config.tests/unix/mips_dspr2/mips_dspr2.pro
@@ -0,0 +1,2 @@
+SOURCES = mips_dspr2.cpp
+CONFIG -= x11 qt