diff options
| author | Kimmo Ollila <kimmo.ollila@qt.io> | 2017-01-12 00:54:16 +0200 |
|---|---|---|
| committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2017-01-13 09:57:14 +0000 |
| commit | dcc2a07791243d0010d25f092da2d1747ae2f711 (patch) | |
| tree | 36d443bc4291feb1dadde9b7b252b67c18a16c7d /src/3rdparty | |
| parent | 0820efecb48d241f46f13f72c688d809fab6b72d (diff) | |
Add initial support for INTEGRITY
Change-Id: I1b44263a700f6c48c3b7798b662b30b03f9a4dc4
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h | 2 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/Compiler.h | 5 | ||||
| -rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 16 |
3 files changed, 19 insertions, 4 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/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/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 |