Merge from existing archive branch

[pcre3.git] / debian / patches / no_jit_x32_powerpcspe.patch

diff --git a/debian/patches/no_jit_x32_powerpcspe.patch b/debian/patches/no_jit_x32_powerpcspe.patch
index e1b8133ea2d63c9ac6b93aa837a43cd6ab68f390..af4fcdce8aa221157608a8afb312dce787628a86 100644 (file)
--- a/debian/patches/no_jit_x32_powerpcspe.patch
+++ b/debian/patches/no_jit_x32_powerpcspe.patch
@@ -1,9 +1,16 @@
-Description: Disable JIT on x32, needs explicit porting to ILP32 amd64, FPU-less PowerPC.
-Author: Thorsten Glaser <tg@mirbsd.org>, Roland Stigge <stigge@antcom.de>
+From: Matthew Vernon <matthew@debian.org>
+Date: Wed, 13 Jul 2016 21:20:13 +0100
+Subject: no_jit_x32_powerpcspe
 
+---
+ sljit/sljitConfigInternal.h | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/sljit/sljitConfigInternal.h b/sljit/sljitConfigInternal.h
+index 9275b14..b2bc80a 100644
 --- a/sljit/sljitConfigInternal.h
 +++ b/sljit/sljitConfigInternal.h
-@@ -97,7 +97,11 @@
+@@ -117,7 +117,11 @@
  #if defined(__i386__) || defined(__i386)
  #define SLJIT_CONFIG_X86_32 1
  #elif defined(__x86_64__)
@@ -16,7 +23,7 @@ Author: Thorsten Glaser <tg@mirbsd.org>, Roland Stigge <stigge@antcom.de>
  #elif defined(__arm__) || defined(__ARM__)
  #ifdef __thumb2__
  #define SLJIT_CONFIG_ARM_THUMB2 1
-@@ -111,7 +115,11 @@
+@@ -131,7 +135,11 @@
  #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__))
  #define SLJIT_CONFIG_PPC_64 1
  #elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER)