diff options
| -rw-r--r-- | src/3rdparty/masm/assembler/ARM64Assembler.h | 7 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 5 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 2 |
3 files changed, 8 insertions, 6 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) diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 6f10dd738b..a3ef395076 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -104,7 +104,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } # define V4_ENABLE_JIT # endif #elif defined(Q_PROCESSOR_ARM_64) && (QT_POINTER_SIZE == 8) -# if defined(Q_OS_LINUX) +# if defined(Q_OS_LINUX) || defined(Q_OS_QNX) # define V4_ENABLE_JIT # endif #elif defined(Q_PROCESSOR_MIPS_32) && defined(Q_OS_LINUX) |