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 d49909680ad5d27823539de15e0e0bfb550d4fef..af4fcdce8aa221157608a8afb312dce787628a86 100644 (file)
--- a/debian/patches/no_jit_x32_powerpcspe.patch
+++ b/debian/patches/no_jit_x32_powerpcspe.patch
@@ -1,10 +1,15 @@
-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
 
-Index: pcre3/sljit/sljitConfigInternal.h
-===================================================================
---- pcre3.orig/sljit/sljitConfigInternal.h     2015-07-31 12:00:43.000000000 +0100
-+++ pcre3/sljit/sljitConfigInternal.h  2015-12-22 13:30:50.000000000 +0000
+---
+ 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
 @@ -117,7 +117,11 @@
  #if defined(__i386__) || defined(__i386)
  #define SLJIT_CONFIG_X86_32 1