diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2017-01-26 11:46:56 +0100 |
commit | 9225ac7348c9023093b6ef8d4519087c7dddeaa2 (patch) | |
tree | 4660e25bd5cfd4a2a40b0ad97ea689c4acb22a8c /src/3rdparty/masm/wtf/Platform.h | |
parent | 9d8fe2ac121162c15be6728495be2235b728325a (diff) | |
parent | 0076c44d3993f377ad6417d3bb08109b608dfbd2 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/pointerhandler
Change-Id: I7962fd2282792c43af69784c8e98fb050fd928a7
Diffstat (limited to 'src/3rdparty/masm/wtf/Platform.h')
-rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 16 |
1 files changed, 13 insertions, 3 deletions
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 |