diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2013-03-07 00:03:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-12 01:21:15 +0100 |
| commit | eef7a68acdce3735bbe684acfb1efb836b3c8df2 (patch) | |
| tree | a3d6f5420abb81d42c0b6147ff1b6a0455a07ba3 /src/3rdparty/pcre | |
| parent | 341fb50d5b4433193b47cffa0d513f633d9978cd (diff) | |
Disable PCRE JIT on iOS
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 <richard.gustavsen@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Diffstat (limited to 'src/3rdparty/pcre')
| -rw-r--r-- | src/3rdparty/pcre/config.h | 4 |
1 files changed, 2 insertions, 2 deletions
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 |