qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add initial support for INTEGRITY 

Change-Id: I1b44263a700f6c48c3b7798b662b30b03f9a4dc4
Reviewed-by: Rolland Dudemaine <rolland@ghs.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Kimmo Ollila 2017-01-12 00:54:16 +02:00 committed by Kimmo Ollila
parent 0820efecb4
commit dcc2a07791
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/masm/assembler/MacroAssemblerCodeRef.h vendored
View File

@ -66,7 +66,7 @@
#define CALLING_CONVENTION_IS_STDCALL 0 #define CALLING_CONVENTION_IS_STDCALL 0
#endif #endif
#if CPU(X86) #if CPU(X86) && !OS(INTEGRITY)
#define HAS_FASTCALL_CALLING_CONVENTION 1 #define HAS_FASTCALL_CALLING_CONVENTION 1
#ifndef FASTCALL #ifndef FASTCALL
#if COMPILER(MSVC) #if COMPILER(MSVC)

5
src/3rdparty/masm/wtf/Compiler.h vendored
View File

@ -113,6 +113,11 @@
#define GCCE_VERSION_AT_LEAST(major, minor, patch) (GCCE_VERSION >= (major * 10000 + minor * 100 + patch)) #define GCCE_VERSION_AT_LEAST(major, minor, patch) (GCCE_VERSION >= (major * 10000 + minor * 100 + patch))
#endif #endif
/* COMPILER(GHS) - Green Hills MULTI Compiler */
#if defined(__ghs)
#define WTF_COMPILER_GHS 1
#endif
/* COMPILER(GCC) - GNU Compiler Collection */ /* COMPILER(GCC) - GNU Compiler Collection */
/* --gnu option of the RVCT compiler also defines __GNUC__ */ /* --gnu option of the RVCT compiler also defines __GNUC__ */
#if defined(__GNUC__) && !COMPILER(RVCT) #if defined(__GNUC__) && !COMPILER(RVCT)

14
src/3rdparty/masm/wtf/Platform.h vendored
View File

@ -224,7 +224,8 @@
#elif defined(__ARM_ARCH_7A__) \ #elif defined(__ARM_ARCH_7A__) \
|| defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_7S__) \
|| defined(__CORE_CORTEXA__) // GHS-specific
#define WTF_ARM_ARCH_VERSION 7 #define WTF_ARM_ARCH_VERSION 7
/* MSVC sets _M_ARM */ /* MSVC sets _M_ARM */
@ -268,7 +269,8 @@
|| defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7A__) \
|| defined(__ARM_ARCH_7M__) \ || defined(__ARM_ARCH_7M__) \
|| defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7R__) \
|| defined(__ARM_ARCH_7S__) || defined(__ARM_ARCH_7S__) \
|| defined(__CORE_CORTEXA__) // GHS-specific
#define WTF_THUMB_ARCH_VERSION 4 #define WTF_THUMB_ARCH_VERSION 4
/* RVCT sets __TARGET_ARCH_THUMB */ /* RVCT sets __TARGET_ARCH_THUMB */
@ -385,6 +387,11 @@
#define WTF_OS_HURD 1 #define WTF_OS_HURD 1
#endif #endif
/* OS(INTEGRITY) - INTEGRITY */
#ifdef __INTEGRITY
#define WTF_OS_INTEGRITY 1
#endif
/* OS(LINUX) - Linux */ /* OS(LINUX) - Linux */
#ifdef __linux__ #ifdef __linux__
#define WTF_OS_LINUX 1 #define WTF_OS_LINUX 1
@ -433,6 +440,7 @@
|| OS(DARWIN) \ || OS(DARWIN) \
|| OS(FREEBSD) \ || OS(FREEBSD) \
|| OS(HURD) \ || OS(HURD) \
|| OS(INTEGRITY) \
|| OS(LINUX) \ || OS(LINUX) \
|| OS(NETBSD) \ || OS(NETBSD) \
|| OS(OPENBSD) \ || OS(OPENBSD) \
@ -603,7 +611,9 @@
#if OS(UNIX) #if OS(UNIX)
#define HAVE_ERRNO_H 1 #define HAVE_ERRNO_H 1
#if !OS(INTEGRITY)
#define HAVE_MMAP 1 #define HAVE_MMAP 1
#endif
#define HAVE_SIGNAL_H 1 #define HAVE_SIGNAL_H 1
#define HAVE_STRINGS_H 1 #define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1 #define HAVE_SYS_PARAM_H 1