summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>2019-03-25 14:10:24 +0000
committerzherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>2019-03-25 14:10:24 +0000
commit706a1c624c591e404a7739b49fd33830427ff2af (patch)
tree070aaaaacd4bb91071f4d1558b155978753f1060
parent3bf3763f680dc980cda4135c91d85d8fe9ab2bb6 (diff)
downloadpcre2-706a1c624c591e404a7739b49fd33830427ff2af.tar.gz
Disable SSE2 JIT optimizations in x86 CPUs when SSE2 is not available.
git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1082 6239d852-aaf2-0410-a92c-79f79f948069
-rw-r--r--ChangeLog3
-rw-r--r--src/pcre2_jit_compile.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 331cb2f..b0be50f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,9 @@ it appears to work fine on Linux.
source directory wasn't in the search path for AC_TRY_COMPILE always. Patch
from Ross Burton.
+36. Disable SSE2 JIT optimizations in x86 CPUs when SSE2 is not available.
+Patch by Guillem Jover.
+
Version 10.32 10-September-2018
-------------------------------
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
index 6519b4b..256356c 100644
--- a/src/pcre2_jit_compile.c
+++ b/src/pcre2_jit_compile.c
@@ -6268,7 +6268,7 @@ for (i = 0; i < max; i++)
}
#if (defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) && !(defined SUPPORT_VALGRIND) && !(defined _WIN64)
-if (check_fast_forward_char_pair_sse2(common, chars, max))
+if (sljit_has_cpu_feature(SLJIT_HAS_SSE2) && check_fast_forward_char_pair_sse2(common, chars, max))
return TRUE;
#endif