diff options
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore')
3 files changed, 24 insertions, 4 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri index f8f7529..2298de3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri +++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri @@ -41,7 +41,7 @@ DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF win32-* { # Prevent definition of min, max macros in windows.h DEFINES+=NOMINMAX - LIBS += -lwinmm + LIBS_PRIVATE += -lwinmm } contains(JAVASCRIPTCORE_JIT,yes) { DEFINES+=ENABLE_JIT=1 diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h index fc5676a..81a1d8a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MathExtras.h @@ -90,7 +90,7 @@ inline bool signbit(double x) { struct ieee_double *p = (struct ieee_double *)&x #endif -#if COMPILER(MSVC) || COMPILER(RVCT) +#if (COMPILER(MSVC) && _MSC_VER < 1800) || COMPILER(RVCT) // We must not do 'num + 0.5' or 'num - 0.5' because they can cause precision loss. static double round(double num) @@ -115,7 +115,7 @@ inline double trunc(double num) { return num > 0 ? floor(num) : ceil(num); } #endif -#if COMPILER(MSVC) +#if COMPILER(MSVC) && _MSC_VER < 1800 inline bool isinf(double num) { return !_finite(num) && !_isnan(num); } inline bool isnan(double num) { return !!_isnan(num); } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index d483806..94de5ec 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -325,7 +325,27 @@ #endif /* ARM */ +#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) +#define WTF_CPU_MIPS 1 +#include <sgidefs.h> +#if defined(__MIPSEB__) +#define WTF_CPU_BIG_ENDIAN 1 +#endif +/* CPU(MIPS64) - MIPS 64-bit both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABI64) && (_MIPS_SIM == _MIPS_SIM_ABI64) +#define WTF_CPU_MIPS64 1 +#endif +/* CPU(MIPSN32) - MIPS N32 ABI both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABIN32) && (_MIPS_SIM == _MIPS_SIM_ABIN32) +#define WTF_CPU_MIPSN32 1 +#endif + +/* CPU(MIPS32) - MIPS O32 ABI both BIG and LITTLE endian */ +#if defined(_MIPS_SIM_ABI32) && (_MIPS_SIM == _MIPS_SIM_ABI32) +#define WTF_CPU_MIPS32 1 +#endif +#endif /* __mips__ */ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ @@ -876,7 +896,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) +#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) #define WTF_USE_JSVALUE64 1 #elif CPU(ARM) || CPU(PPC64) #define WTF_USE_JSVALUE32 1 |