Don't assume hardfloat passing convention.

Add configure test to detect the floating point abi. Test the value
of the test in the v8.pri to enable hardfloat usage.

Change-Id: I2312763bb1b814915a74e734ab477ba66f1ee0d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

diff --git a/config.tests/hardfloat/hardfloat.cpp b/config.tests/hardfloat/hardfloat.cpp
new file mode 100644 (file)
index 0000000..7b36d5c
--- /dev/null
+++ b/config.tests/hardfloat/hardfloat.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** 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**)
+{
+    // pretend to do some floating point math, but none of this is required
+    double a = 0.03, b = 16.05;
+    double c = a * b;
+    return (int)c;
+}

diff --git a/config.tests/hardfloat/hardfloat.pro b/config.tests/hardfloat/hardfloat.pro
new file mode 100644 (file)
index 0000000..6aa1dd8
--- /dev/null
+++ b/config.tests/hardfloat/hardfloat.pro
@@ -0,0 +1,15 @@
+CONFIG -= x11 qt
+SOURCES = hardfloat.cpp
+OBJECTS_DIR = obj
+QMAKE_CXXFLAGS += -MD
+
+equals(QT_ARCH, "arm"):unix {
+    test.commands = readelf -A hardfloat | grep -q \'Tag_ABI_VFP_args: VFP registers\'
+    test.depends = hardfloat
+    QMAKE_EXTRA_TARGETS += test
+
+    default.target = all
+    default.depends += test
+    QMAKE_EXTRA_TARGETS += default
+}
+

diff --git a/src/v8/v8.pri b/src/v8/v8.pri
index 530b2a7..a67a6c1 100644 (file)
--- a/src/v8/v8.pri
+++ b/src/v8/v8.pri
@@ -149,7 +149,12 @@ SOURCES += \
 
 equals(V8_TARGET_ARCH, arm) {
 DEFINES += V8_TARGET_ARCH_ARM
-DEFINES += USE_EABI_HARDFLOAT=1 CAN_USE_VFP_INSTRUCTIONS
+contains(config_test_hardfloat, yes) {
+    DEFINES += USE_EABI_HARDFLOAT=1
+} else {
+    DEFINES += USE_EABI_HARDFLOAT=0
+}
+DEFINES += CAN_USE_VFP_INSTRUCTIONS
 SOURCES += \
     $$V8SRC/arm/builtins-arm.cc \
     $$V8SRC/arm/code-stubs-arm.cc \

diff --git a/sync.profile b/sync.profile
index 7a88ec1..365e554 100644 (file)
--- a/sync.profile
+++ b/sync.profile
@@ -24,3 +24,8 @@
 %dependencies = (
         "qtbase" => "refs/heads/master",
 );
+
+# compile tests
+%configtests = (
+    "hardfloat" => {},
+);