diff options
| -rw-r--r-- | config.tests/arch/arch.cpp | 7 | ||||
| -rw-r--r-- | config.tests/unix/mips_dsp/mips_dsp.cpp | 47 | ||||
| -rw-r--r-- | config.tests/unix/mips_dsp/mips_dsp.pro | 2 | ||||
| -rw-r--r-- | config.tests/unix/mips_dspr2/mips_dspr2.cpp | 49 | ||||
| -rw-r--r-- | config.tests/unix/mips_dspr2/mips_dspr2.pro | 2 | ||||
| -rwxr-xr-x | configure | 24 |
6 files changed, 122 insertions, 9 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 @@ -837,8 +837,8 @@ CFG_REDUCE_RELOCATIONS=auto CFG_ACCESSIBILITY=auto CFG_IWMMXT=no CFG_NEON=auto -CFG_MIPS_DSP=yes -CFG_MIPS_DSPR2=yes +CFG_MIPS_DSP=auto +CFG_MIPS_DSPR2=auto CFG_CLOCK_GETTIME=auto CFG_CLOCK_MONOTONIC=auto CFG_MREMAP=auto @@ -3994,17 +3994,25 @@ elif [ "$CFG_ARCH" != "arm" ]; then fi # detect mips_dsp support -if [ "${CFG_ARCH}" = "mips" ] && [ "${CFG_MIPS_DSP}" = "yes" ]; then - CFG_MIPS_DSP=yes +if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSP}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mips_dsp "mips_dsp" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then + CFG_MIPS_DSP=yes else - CFG_MIPS_DSP=no + CFG_MIPS_DSP=no + fi +elif [ "$CFG_ARCH" != "mips" ]; then + CFG_MIPS_DSP=no fi # detect mips_dspr2 support -if [ "${CFG_ARCH}" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "yes" ]; then - CFG_MIPS_DSPR2=yes +if [ "$CFG_ARCH" = "mips" ] && [ "${CFG_MIPS_DSPR2}" = "auto" ]; then + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/mips_dspr2 "mips_dspr2" $L_FLAGS $I_FLAGS $D_FLAGS $l_FLAGS; then + CFG_MIPS_DSPR2=yes else - CFG_MIPS_DSPR2=no + CFG_MIPS_DSPR2=no + fi +elif [ "$CFG_ARCH" != "mips" ]; then + CFG_MIPS_DSPR2=no fi [ "$XPLATFORM_MINGW" = "yes" ] && QMakeVar add styles "windowsxp windowsvista" |