[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 111a7f42a700636385db348f59b7b3fa4b3d3240
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 25 19:30:04 2010 +0000

    2010-10-25  David Tapuska  <dtapuska at rim.com>
    
            Reviewed by David Kilzer.
    
            Enable VFP if our compiler settings indicated we had a hardware
            VFP.
    
            https://bugs.webkit.org/show_bug.cgi?id=46096
    
            * assembler/MacroAssemblerARM.cpp:
            (JSC::isVFPPresent):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70474 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 1cb5c99..a227f13 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-25  David Tapuska  <dtapuska at rim.com>
+
+        Reviewed by David Kilzer.
+
+        Enable VFP if our compiler settings indicated we had a hardware
+        VFP.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46096
+
+        * assembler/MacroAssemblerARM.cpp:
+        (JSC::isVFPPresent):
+
 2010-10-25  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r70451.
diff --git a/JavaScriptCore/assembler/MacroAssemblerARM.cpp b/JavaScriptCore/assembler/MacroAssemblerARM.cpp
index b5b20fa..2db5df1 100644
--- a/JavaScriptCore/assembler/MacroAssemblerARM.cpp
+++ b/JavaScriptCore/assembler/MacroAssemblerARM.cpp
@@ -57,7 +57,11 @@ static bool isVFPPresent()
     }
 #endif
 
+#if (COMPILER(RVCT) && defined(__TARGET_FPU_VFP)) || (COMPILER(GCC) && defined(__VFP_FP__))
+    return true;
+#else
     return false;
+#endif
 }
 
 const bool MacroAssemblerARM::s_isVFPPresent = isVFPPresent();

-- 
WebKit Debian packaging