kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ab/pcre-v2' into maint 

Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.

* ab/pcre-v2:
  grep: fix NO_LIBPCRE1_JIT to fully disable JIT
maint
Junio C Hamano 2017-11-21 14:05:30 +09:00
parent b77b96e29b 2fff1e196d
commit 8e3e51a3a7
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
grep.c
View File

@ -387,7 +387,7 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
if (!p->pcre1_regexp) if (!p->pcre1_regexp)
compile_regexp_failed(p, error); compile_regexp_failed(p, error);


p->pcre1_extra_info = pcre_study(p->pcre1_regexp, PCRE_STUDY_JIT_COMPILE, &error); p->pcre1_extra_info = pcre_study(p->pcre1_regexp, GIT_PCRE_STUDY_JIT_COMPILE, &error);
if (!p->pcre1_extra_info && error) if (!p->pcre1_extra_info && error)
die("%s", error); die("%s", error);



5
grep.h
View File

@ -7,11 +7,12 @@
#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32 #if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
#ifndef NO_LIBPCRE1_JIT #ifndef NO_LIBPCRE1_JIT
#define GIT_PCRE1_USE_JIT #define GIT_PCRE1_USE_JIT
#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
#endif #endif
#endif #endif
#endif #endif
#ifndef PCRE_STUDY_JIT_COMPILE #ifndef GIT_PCRE_STUDY_JIT_COMPILE
#define PCRE_STUDY_JIT_COMPILE 0 #define GIT_PCRE_STUDY_JIT_COMPILE 0
#endif #endif
#if PCRE_MAJOR <= 8 && PCRE_MINOR < 20 #if PCRE_MAJOR <= 8 && PCRE_MINOR < 20
typedef int pcre_jit_stack; typedef int pcre_jit_stack;