diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-23 19:04:53 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2014-10-28 10:41:28 +0100 |
| commit | d3c1f581037efde000b0716b55c8ca830bae0482 (patch) | |
| tree | 7e561f2ddd59a9094c3a1fb369c43b9a183535ae | |
| parent | 400872d024cee95d1cfc1253d009c0c6777ea5a3 (diff) | |
LLInt is not built with ARM softfp ABI
In fixing QTBUG-35681 we disabled LLInt when hard fp is not set. This
is however too strong a condition as we only need to be allowed to use
floating point instructions, not use the hard floating point ABI.
LLInt is also disabled on Android because it currently doesn't build.
Task-number: QTBUG-35681
Change-Id: Ibe109b0f8fe6acaec90d42305c6151a440141ea9
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/WTF/wtf/Platform.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index a53c60de5..a4635a4fa 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -810,7 +810,7 @@ #endif /* LLINT on ARM depends on an FPU */ -#if !defined(ENABLE_LLINT) && CPU(ARM) && !CPU(ARM_HARDFP) +#if !defined(ENABLE_LLINT) && CPU(ARM) && (!CPU(ARM_VFP) || OS(ANDROID)) #define ENABLE_LLINT 0 #endif |