From: Matthew Vernon Date: Tue, 26 May 2015 07:26:19 +0000 (+0100) Subject: enable jit again on ppc64el (#786530) X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=pcre3.git;a=commitdiff_plain;h=d5c62d4f0217f00fa9ba6f660ff069d79d0953c8 enable jit again on ppc64el (#786530) --- diff --git a/debian/patches/no_jit_ppc64el.patch b/debian/patches/no_jit_ppc64el.patch deleted file mode 100644 index cf600a3..0000000 --- a/debian/patches/no_jit_ppc64el.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Disable JIT on ppc64el, needs explicit porting to ELFv2. -Author: Adam Conrad - ---- a/sljit/sljitConfigInternal.h -+++ b/sljit/sljitConfigInternal.h -@@ -109,7 +109,11 @@ - #elif defined (__aarch64__) - #define SLJIT_CONFIG_ARM_64 1 - #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_ARCH_PPC64) || (defined(_POWER) && defined(__64BIT__)) --#define SLJIT_CONFIG_PPC_64 1 -+# if _CALL_ELF != 2 -+# define SLJIT_CONFIG_PPC_64 1 -+# else -+# define SLJIT_CONFIG_UNSUPPORTED 1 -+# endif - #elif defined(__ppc__) || defined(__powerpc__) || defined(_ARCH_PPC) || defined(_ARCH_PWR) || defined(_ARCH_PWR2) || defined(_POWER) - #define SLJIT_CONFIG_PPC_32 1 - #elif defined(__mips__) && !defined(_LP64) diff --git a/debian/patches/series b/debian/patches/series index 8892f49..e807728 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,5 @@ pcreposix.patch pcre_info.patch pcregrep.1-patch soname.patch -no_jit_ppc64el.patch Fix-silly-quantifier-size-check.patch cve-2014-8964.patch