From c889b401d4668482bdef6c976bfa2d57144cf7ed Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Wed, 4 Dec 2013 17:52:49 +0000 Subject: qt webkit: add support for MIPS64 platforms qt5webkit is not fixed and this patch cannont be applied to qt5webkit Task-number: QTBUG-35394 Change-Id: Ie2d332345741989a0b4ef93306ca36b42e888c11 Signed-off-by: Vicente Olivert Riera Reviewed-by: Allan Sandfeld Jensen --- .../webkit/Source/JavaScriptCore/wtf/Platform.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h index a8298c4..e8b03be 100644 --- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h @@ -144,16 +144,20 @@ #endif #endif -/* 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_)) \ - && defined(_ABIO32) +/* CPU(MIPS) - MIPS 32-bit and 64-bit */ +#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) \ + || defined(__mips64)) +#if defined(__mips64) +#define WTF_CPU_MIPS64 1 +#define WTF_MIPS_ARCH __mips64 +#else #define WTF_CPU_MIPS 1 +#define WTF_MIPS_ARCH __mips +#endif #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 @@ -998,7 +1002,8 @@ || CPU(ALPHA) \ || CPU(SPARC64) \ || CPU(S390X) \ - || CPU(PPC64) + || CPU(PPC64) \ + || CPU(MIPS64) #define WTF_USE_JSVALUE64 1 #else #define WTF_USE_JSVALUE32_64 1 -- cgit v0.12