summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-21 12:19:28 -0300
committerLisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>2014-05-21 12:19:28 -0300
commit5a35e6bf00325df99bfdcc830289051f82577b15 (patch)
tree5e763804567d27ca7ba79d6acfe883f482e588ca /debian/patches
parentf4033fdcb9669de4248c5d236a1f4bcf2a236be1 (diff)
downloadqtscript-5a35e6bf00325df99bfdcc830289051f82577b15.tar.gz
Refresh s390x_jscore.diff.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/s390x_jscore.diff11
1 files changed, 5 insertions, 6 deletions
diff --git a/debian/patches/s390x_jscore.diff b/debian/patches/s390x_jscore.diff
index 4020a3e..9f7999e 100644
--- a/debian/patches/s390x_jscore.diff
+++ b/debian/patches/s390x_jscore.diff
@@ -2,7 +2,7 @@ Description: Add support for s390/s390x architectures
Author: Dan Horák <dan@danny.cz>
Origin: vendor (http://trac.webkit.org/changeset?old_path=%2Ftrunk&old=71843+&new_path=%2Ftrunk&new=71844+)
Forwarded: no
-Last-Update: 2013-12-14
+Last-Update: 2014-05-21
---
src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 14 +++++++++++++-
@@ -10,7 +10,7 @@ Last-Update: 2013-12-14
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -189,6 +189,19 @@
+@@ -189,6 +189,18 @@
#define WTF_CPU_SPARC 1
#endif
@@ -26,16 +26,15 @@ Last-Update: 2013-12-14
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+
-+
/* CPU(X86) - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \
-@@ -896,7 +909,7 @@
+@@ -911,7 +923,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(MIPS64)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(S390X)
+-#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64)
++#if (CPU(X86_64) && !CPU(X32) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64) || CPU(MIPS64) || CPU(AARCH64) || CPU(S390X)
#define WTF_USE_JSVALUE64 1
#elif CPU(ARM) || CPU(PPC64)
#define WTF_USE_JSVALUE32 1