~ubuntu-branches/ubuntu/trusty/qtscript-opensource-src/trusty-proposed

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
Description: Add support for AArch64 to JavaScriptCore.
Author: William Grant <wgrant@ubuntu.com>

Index: qtscript-opensource-src-5.1.1+dfsg-2ubuntu1~really5.0.2+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
===================================================================
--- qtscript-opensource-src-5.1.1+dfsg-2ubuntu1~really5.0.2+dfsg.orig/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-02-10 13:26:12.758011823 +0000
+++ qtscript-opensource-src-5.1.1+dfsg-2ubuntu1~really5.0.2+dfsg/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	2014-02-10 13:26:12.746011822 +0000
@@ -337,7 +337,9 @@
 
 #endif /* ARM */
 
-
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#endif
 
 /* ==== OS() - underlying operating system; only to be used for mandated low-level services like 
    virtual memory, not to choose a GUI toolkit ==== */
@@ -885,7 +887,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X)
+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(S390X) || CPU(AARCH64)
 #define WTF_USE_JSVALUE64 1
 #elif CPU(ARM) || CPU(PPC64)
 #define WTF_USE_JSVALUE32 1