diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-07 15:30:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-07 20:05:59 +0100 |
| commit | 5197906b6baee9c13b31286f2a0ebbfcac3961e0 (patch) | |
| tree | de07b24e02e9481e189ff45feedfba8a1a1b45fc | |
| parent | d3599a40098ae26865403d19acc9e4ad3a15a2ed (diff) | |
| download | qtwebkit-5197906b6baee9c13b31286f2a0ebbfcac3961e0.tar.gz | |
Detect MIPS64 architecture
Adds WTF platform support for the MIPS64 architecture.
Patch is based on http://patches.openembedded.org/patch/51625/
Task-number: QTBUG-35394
Change-Id: I270d2d89cc1d93f06f5b40a6d1042ad5fbac2fe7
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/WTF/wtf/Platform.h | 14 | ||||
| -rw-r--r-- | Source/WTF/wtf/dtoa/utils.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index cddc21076..020f8fc08 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -79,16 +79,23 @@ #endif #endif +/* CPU(MIPS64) - MIPS 64-bit */ +#if defined(__mips64) +#define WTF_CPU_MIPS64 1 +#define WTF_MIPS_ARCH __mips64 /* CPU(MIPS) - MIPS 32-bit */ /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */ -#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ +#elif (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ && defined(_ABIO32) #define WTF_CPU_MIPS 1 +#define WTF_MIPS_ARCH __mips +#endif + +#if CPU(MIPS) || CPU(MIPS64) #if defined(__MIPSEB__) #define WTF_CPU_BIG_ENDIAN 1 #endif #define WTF_MIPS_PIC (defined __PIC__) -#define WTF_MIPS_ARCH __mips #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v) #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v) #define WTF_MIPS_ARCH_REV __mips_isa_rev @@ -322,7 +329,7 @@ #endif /* ARM */ -#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) +#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 #endif @@ -725,6 +732,7 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ + || CPU(MIPS64) \ || CPU(PPC64) #define WTF_USE_JSVALUE64 1 #else diff --git a/Source/WTF/wtf/dtoa/utils.h b/Source/WTF/wtf/dtoa/utils.h index e2f0a405c..6dc7d5108 100644 --- a/Source/WTF/wtf/dtoa/utils.h +++ b/Source/WTF/wtf/dtoa/utils.h @@ -49,7 +49,7 @@ defined(__ARMEL__) || \ defined(_MIPS_ARCH_MIPS32R2) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) +#elif CPU(MIPS) || CPU(PPC) || CPU(PPC64) || OS(WINCE) || CPU(SH4) || CPU(S390) || CPU(S390X) || CPU(IA64) || CPU(SPARC) || CPU(ALPHA) || CPU(MIPS64) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 #elif defined(_M_IX86) || defined(__i386__) #if defined(_WIN32) |