From eef7a68acdce3735bbe684acfb1efb836b3c8df2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 7 Mar 2013 00:03:17 +0100 Subject: [PATCH] Disable PCRE JIT on iOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit First of all, we were missing an implementation of SLJIT_CACHE_FLUSH, as ___clear_cache was not available and we would get missing symbols. This was fixed in upstream PCRE 8.31, but even then the JIT would only work on jailbroken devices, so we disable it. http://bugs.exim.org/show_bug.cgi?id=1243 Change-Id: I678f9a31eb76d7d08882465befb9d799e46e7cf8 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Simon Hausmann Reviewed-by: Morten Johan Sørvig Reviewed-by: Giuseppe D'Angelo --- src/3rdparty/pcre.pri | 1 + src/3rdparty/pcre/config.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/pcre.pri b/src/3rdparty/pcre.pri index 6ab9d4dc87..41ce218c9e 100644 --- a/src/3rdparty/pcre.pri +++ b/src/3rdparty/pcre.pri @@ -1,6 +1,7 @@ DEFINES += PCRE_HAVE_CONFIG_H win32:DEFINES += PCRE_STATIC +ios:DEFINES += PCRE_DISABLE_JIT INCLUDEPATH += $$PWD/pcre SOURCES += \ diff --git a/src/3rdparty/pcre/config.h b/src/3rdparty/pcre/config.h index 6dda704f68..ed388fc9ba 100644 --- a/src/3rdparty/pcre/config.h +++ b/src/3rdparty/pcre/config.h @@ -20,7 +20,7 @@ - x86/x86-64 - MIPS 32bit (__GNUC__ compilers only) */ -#if \ +#if !defined(PCRE_DISABLE_JIT) && (\ /* ARM */ \ (defined(__GNUC__) && (defined(__arm__) || defined(__TARGET_ARCH_ARM))) \ /* x86 32/64 */ \ @@ -29,6 +29,6 @@ /* MIPS32 */ \ || (defined(__GNUC__) \ && (defined(__mips) || defined(__mips__)) \ - && !(defined(_MIPS_ARCH_MIPS64) || defined(__mips64))) + && !(defined(_MIPS_ARCH_MIPS64) || defined(__mips64)))) # define SUPPORT_JIT #endif