diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-01-10 16:11:30 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2018-01-11 08:23:33 +0000 |
| commit | 7cf3421858c96ff3a2fe3b860be01a3e0e1133cf (patch) | |
| tree | c3850b057bbe22af0bb90570a14cdb00097f940a /src/3rdparty | |
| parent | 1dd3769fb50ff70c7f3d7a5d0210fb83ae7bc62a (diff) | |
Enable JIT on QNX7 for ARM64
Remove abs(long) definition, since the #ifdef check no longer works
with QNX7 and QNX < 6.6 is no longer supported.
[ChangeLog][Qml] Enabled ARM64 JIT for QNX7
Change-Id: Ife02f3edb508eddaf15da65954496265366e232d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/ARM64Assembler.h | 7 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/3rdparty/masm/assembler/ARM64Assembler.h b/src/3rdparty/masm/assembler/ARM64Assembler.h index 7390997af1..008f03bccf 100644 --- a/src/3rdparty/masm/assembler/ARM64Assembler.h +++ b/src/3rdparty/masm/assembler/ARM64Assembler.h @@ -3032,6 +3032,13 @@ public: linuxPageFlush(current, current + page); linuxPageFlush(current, end); +#elif OS(QNX) +#if !ENABLE(ASSEMBLER_WX_EXCLUSIVE) + msync(code, size, MS_INVALIDATE_ICACHE); +#else + UNUSED_PARAM(code); + UNUSED_PARAM(size); +#endif #else #error "The cacheFlush support is missing on this platform." #endif diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 3740d54beb..a529ba7b37 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -147,11 +147,6 @@ inline long lroundf(float num) { return static_cast<long>(roundf(num)); } #endif -#if COMPILER(GCC) && OS(QNX) && _CPPLIB_VER < 640 -// The stdlib on QNX < 6.6 doesn't contain long abs(long). See PR #104666. -inline long long abs(long num) { return labs(num); } -#endif - #if COMPILER(MSVC) && COMPILER(MSVC12_OR_LOWER) // MSVC's math.h does not currently supply log2 or log2f. inline double log2(double num) |