6 files changed, 22 insertions, 27 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
index f03254aa38..e3c77d99e6 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h
@@ -66,7 +66,7 @@
 #define CALLING_CONVENTION_IS_STDCALL 0
 #endif
 
-#if CPU(X86)
+#if CPU(X86) && !OS(INTEGRITY)
 #define HAS_FASTCALL_CALLING_CONVENTION 1
 #ifndef FASTCALL
 #if COMPILER(MSVC)
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h
index 5a3939b7b2..8617229b06 100644
--- a/src/3rdparty/masm/stubs/ExecutableAllocator.h
+++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h
@@ -39,11 +39,6 @@
 #ifndef MASM_EXECUTABLEALLOCATOR_H
 #define MASM_EXECUTABLEALLOCATOR_H
 
-// Defined via mkspec
-#if _MSC_VER >= 1900
-#include <windows.h>
-#endif
-
 #include <RefPtr.h>
 #include <RefCounted.h>
 #include <wtf/PageBlock.h>
@@ -117,13 +112,11 @@ struct ExecutableAllocator {
         DWORD oldProtect;
 #    if !OS(WINRT)
         VirtualProtect(addr, size, PAGE_READWRITE, &oldProtect);
-#    elif _MSC_VER >= 1900
+#    else
         bool hr = VirtualProtectFromApp(addr, size, PAGE_READWRITE, &oldProtect);
         if (!hr) {
             Q_UNREACHABLE();
         }
-#    else
-        (void)oldProtect;
 #    endif
 #  else
         int mode = PROT_READ | PROT_WRITE;
@@ -152,13 +145,11 @@ struct ExecutableAllocator {
         DWORD oldProtect;
 #    if !OS(WINRT)
         VirtualProtect(addr, size, PAGE_EXECUTE_READ, &oldProtect);
-#    elif _MSC_VER >= 1900
+#    else
         bool hr = VirtualProtectFromApp(addr, size, PAGE_EXECUTE_READ, &oldProtect);
         if (!hr) {
             Q_UNREACHABLE();
         }
-#    else
-        (void)oldProtect;
 #    endif
 #  else
         int mode = PROT_READ | PROT_EXEC;
diff --git a/src/3rdparty/masm/wtf/Compiler.h b/src/3rdparty/masm/wtf/Compiler.h
index fc3b5c5c08..da10196cc1 100644
--- a/src/3rdparty/masm/wtf/Compiler.h
+++ b/src/3rdparty/masm/wtf/Compiler.h
@@ -113,6 +113,11 @@
 #define GCCE_VERSION_AT_LEAST(major, minor, patch) (GCCE_VERSION >= (major * 10000 + minor * 100 + patch))
 #endif
 
+/* COMPILER(GHS) - Green Hills MULTI Compiler */
+#if defined(__ghs)
+#define WTF_COMPILER_GHS 1
+#endif
+
 /* COMPILER(GCC) - GNU Compiler Collection */
 /* --gnu option of the RVCT compiler also defines __GNUC__ */
 #if defined(__GNUC__) && !COMPILER(RVCT)
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h
index 75e3670367..3740d54beb 100644
--- a/src/3rdparty/masm/wtf/MathExtras.h
+++ b/src/3rdparty/masm/wtf/MathExtras.h
@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { return copysign(ceil(x), x); }
 
 #endif
 
-#if OS(SOLARIS)
+#if OS(SOLARIS) && __cplusplus < 201103L
 
 namespace std {
 
diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
index b7ad723f07..0a6eda8b98 100644
--- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
+++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp
@@ -32,19 +32,8 @@
 #include "windows.h"
 #include <wtf/Assertions.h>
 
-#if _MSC_VER >= 1900
 // Try to use JIT by default and fallback to non-JIT on first error
 static bool qt_winrt_use_jit = true;
-#else // _MSC_VER < 1900
-#  define PAGE_EXECUTE           0x10
-#  define PAGE_EXECUTE_READ      0x20
-#  define PAGE_EXECUTE_READWRITE 0x40
-#  define MEM_RELEASE 0x8000
-inline void* VirtualAllocFromApp(void*, size_t, int, int) { return 0; }
-inline bool VirtualProtectFromApp(void *, size_t, int, DWORD*) { return false; }
-inline bool VirtualFree(void *, size_t, DWORD) { return false; }
-static bool qt_winrt_use_jit = false;
-#endif // _MSC_VER < 1900
 
 namespace WTF {
 
diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h
index 3f480d344a..bc62c381db 100644
--- a/src/3rdparty/masm/wtf/Platform.h
+++ b/src/3rdparty/masm/wtf/Platform.h
@@ -224,7 +224,8 @@
 
 #elif defined(__ARM_ARCH_7A__) \
     || defined(__ARM_ARCH_7R__) \
-    || defined(__ARM_ARCH_7S__)
+    || defined(__ARM_ARCH_7S__) \
+    || defined(__CORE_CORTEXA__) // GHS-specific
 #define WTF_ARM_ARCH_VERSION 7
 
 /* MSVC sets _M_ARM */
@@ -268,7 +269,8 @@
     || defined(__ARM_ARCH_7A__) \
     || defined(__ARM_ARCH_7M__) \
     || defined(__ARM_ARCH_7R__) \
-    || defined(__ARM_ARCH_7S__)
+    || defined(__ARM_ARCH_7S__) \
+    || defined(__CORE_CORTEXA__) // GHS-specific
 #define WTF_THUMB_ARCH_VERSION 4
 
 /* RVCT sets __TARGET_ARCH_THUMB */
@@ -385,6 +387,11 @@
 #define WTF_OS_HURD 1
 #endif
 
+/* OS(INTEGRITY) - INTEGRITY */
+#ifdef __INTEGRITY
+#define WTF_OS_INTEGRITY 1
+#endif
+
 /* OS(LINUX) - Linux */
 #ifdef __linux__
 #define WTF_OS_LINUX 1
@@ -433,6 +440,7 @@
     || OS(DARWIN)           \
     || OS(FREEBSD)          \
     || OS(HURD)             \
+    || OS(INTEGRITY)        \
     || OS(LINUX)            \
     || OS(NETBSD)           \
     || OS(OPENBSD)          \
@@ -603,7 +611,9 @@
 
 #if OS(UNIX)
 #define HAVE_ERRNO_H 1
-#define HAVE_MMAP 1   
+#if !OS(INTEGRITY)
+#define HAVE_MMAP 1
+#endif
 #define HAVE_SIGNAL_H 1
 #define HAVE_STRINGS_H 1
 #define HAVE_SYS_PARAM_H 1