diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
| commit | d75f99832922079640818fae49a92bb0cf45dfb8 (patch) | |
| tree | 7368ae8bbb9b597f4d68250ed123a07eca5eaa5b /Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | |
| parent | 39226f9b4a387fcc74c55eeea9cd99ffa11247e3 (diff) | |
| parent | 400872d024cee95d1cfc1253d009c0c6777ea5a3 (diff) | |
| download | qtwebkit-d75f99832922079640818fae49a92bb0cf45dfb8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ia01d6aa4899b183f41084ffcb245ef0184c0d826
Diffstat (limited to 'Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp')
| -rw-r--r-- | Source/JavaScriptCore/assembler/MacroAssemblerARM.cpp | 4 |
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) { |