summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Vernon <matthew@debian.org>2015-05-26 08:26:19 +0100
committerMatthew Vernon <matthew@debian.org>2015-05-26 08:26:19 +0100
commitd5c62d4f0217f00fa9ba6f660ff069d79d0953c8 (patch)
tree0a22f2746d37b9e1bbd258f205745e3e85144426
parentd4bd5f32b51c359d51736a9fcac68d0239c8f41d (diff)
enable jit again on ppc64el (#786530)
-rw-r--r--debian/patches/no_jit_ppc64el.patch18
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 19 deletions
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 <adconrad@ubuntu.com>
-
---- 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