diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-02-25 13:56:05 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-02-25 14:00:36 +0100 |
commit | 7ee91ac5621e2fd37c81b531b9488c0b5812a67f (patch) | |
tree | d9fa2466582fc9f1217ffc234935340109136a02 | |
parent | 89acfd44e659502812949c7c71b6874e048b4748 (diff) | |
parent | cbd9ec0defc2558d32ddfd44fe22c1af9c7a36e7 (diff) | |
download | qtjsbackend-7ee91ac5621e2fd37c81b531b9488c0b5812a67f.tar.gz |
Merge branch 'stable' of ssh://codereview.qt-project.org/qt/qtjsbackend into dev
Conflicts:
src/3rdparty/v8/src/platform-linux.cc
src/3rdparty/v8/src/platform-qnx.cc
Change-Id: I1b41564f2d52481335a5d3b2a931c77f9b03c903
-rw-r--r-- | src/3rdparty/v8/src/platform-linux.cc | 1 | ||||
-rw-r--r-- | src/3rdparty/v8/src/platform-qnx.cc | 71 |
2 files changed, 33 insertions, 39 deletions
diff --git a/src/3rdparty/v8/src/platform-linux.cc b/src/3rdparty/v8/src/platform-linux.cc index ec48d63..e6c328f 100644 --- a/src/3rdparty/v8/src/platform-linux.cc +++ b/src/3rdparty/v8/src/platform-linux.cc @@ -191,7 +191,6 @@ CpuImplementer OS::GetCpuImplementer() { return cached_value; } - bool OS::ArmUsingHardFloat() { // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify // the Floating Point ABI used (PCS stands for Procedure Call Standard). diff --git a/src/3rdparty/v8/src/platform-qnx.cc b/src/3rdparty/v8/src/platform-qnx.cc index f0093c6..e535756 100644 --- a/src/3rdparty/v8/src/platform-qnx.cc +++ b/src/3rdparty/v8/src/platform-qnx.cc @@ -148,48 +148,43 @@ CpuImplementer OS::GetCpuImplementer() { return UNKNOWN_IMPLEMENTER; } -// Simple helper function to detect whether the C code is compiled with -// option -mfloat-abi=hard. The register d0 is loaded with 1.0 and the register -// pair r0, r1 is loaded with 0.0. If -mfloat-abi=hard is passed to GCC then -// calling this will return 1.0 and otherwise 0.0. -static void ArmUsingHardFloatHelper() { - asm("mov r0, #0"); -#if defined(__VFP_FP__) && !defined(__SOFTFP__) - // Load 0x3ff00000 into r1 using instructions available in both ARM - // and Thumb mode. - asm("mov r1, #3"); - asm("mov r2, #255"); - asm("lsl r1, r1, #8"); - asm("orr r1, r1, r2"); - asm("lsl r1, r1, #20"); - // For vmov d0, r0, r1 use ARM mode. -#ifdef __thumb__ - asm volatile( - "@ Enter ARM Mode \n\t" - " adr r3, 1f \n\t" - " bx r3 \n\t" - " .ALIGN 4 \n\t" - " .ARM \n" - "1: vmov d0, r0, r1 \n\t" - "@ Enter THUMB Mode\n\t" - " adr r3, 2f+1 \n\t" - " bx r3 \n\t" - " .THUMB \n" - "2: \n\t"); +bool OS::ArmUsingHardFloat() { + // GCC versions 4.6 and above define __ARM_PCS or __ARM_PCS_VFP to specify + // the Floating Point ABI used (PCS stands for Procedure Call Standard). + // We use these as well as a couple of other defines to statically determine + // what FP ABI used. + // GCC versions 4.4 and below don't support hard-fp. + // GCC versions 4.5 may support hard-fp without defining __ARM_PCS or + // __ARM_PCS_VFP. + +#define GCC_VERSION (__GNUC__ * 10000 \ + + __GNUC_MINOR__ * 100 \ + + __GNUC_PATCHLEVEL__) +#if GCC_VERSION >= 40600 +#if defined(__ARM_PCS_VFP) + return true; #else - asm("vmov d0, r0, r1"); -#endif // __thumb__ -#endif // defined(__VFP_FP__) && !defined(__SOFTFP__) - asm("mov r1, #0"); -} + return false; +#endif +#elif GCC_VERSION < 40500 + return false; -bool OS::ArmUsingHardFloat() { - // Cast helper function from returning void to returning double. - typedef double (*F)(); - F f = FUNCTION_CAST<F>(FUNCTION_ADDR(ArmUsingHardFloatHelper)); - return f() == 1.0; +#else +#if defined(__ARM_PCS_VFP) + return true; +#elif defined(__ARM_PCS) || defined(__SOFTFP) || !defined(__VFP_FP__) + return false; +#else +#error "Your version of GCC does not report the FP ABI compiled for." \ + "Please report it on this issue" \ + "http://code.google.com/p/v8/issues/detail?id=2140" + +#endif +#endif +#undef GCC_VERSION } + #endif // def __arm__ |