summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2014-10-23 18:08:52 +0200
committerAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2014-10-23 18:42:29 +0200
commit2d9338631117c2dd25c8362ed10cfa89d1be28aa (patch)
tree306aef0ca6fa0cb6619ef0a02da5b67345fc4562
parent2292b2a96ae2e3afb0d51e7148bccdf4e41596d9 (diff)
downloadqtwebkit-2d9338631117c2dd25c8362ed10cfa89d1be28aa.tar.gz
Do not use floating point instructions in float-abi=soft
Pretend VFP doesn't exist when the ABI forbids floating point instructions. Task-number: QTBUG-38371 Change-Id: Id0552201e6bf98812198c0028e2c85107e967a81 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
-rw-r--r--Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index 0264361b5..6fc08bcb3 100644
--- a/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -47,6 +47,10 @@ namespace JSC {
static bool isVFPPresent()
{
+#if defined(__SOFTFP__)
+ return false;
+#endif
+
#if OS(LINUX)
int fd = open("/proc/self/auxv", O_RDONLY);
if (fd > 0) {