Skip to content

Commit

Permalink
autotools: fix --enable-jit=auto
Browse files Browse the repository at this point in the history
Reflect the new location of sljit and update release files
  • Loading branch information
carenas committed Sep 2, 2024
1 parent 3808655 commit 89627d9
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion NON-AUTOTOOLS-BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ example.
Note that you must compile pcre2_jit_compile.c, even if you have not
defined SUPPORT_JIT in src/config.h, because when JIT support is not
configured, dummy functions are compiled. When JIT support IS configured,
pcre2_jit_compile.c #includes other files from the sljit subdirectory,
pcre2_jit_compile.c #includes other files from the sljit dependency,
all of whose names begin with "sljit". It also #includes
src/pcre2_jit_match.c and src/pcre2_jit_misc.c, so you should not compile
those yourself.
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -865,7 +865,7 @@ The distribution should contain the files listed below.
src/pcre2_jit_simd_inc.h header used by JIT
src/pcre2_ucp.h header for Unicode property handling

sljit/* source files for the JIT compiler
deps/sljit/sljit_src/* source files for the JIT compiler

(B) Source files for programs that use PCRE2:

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ if test "$enable_jit" = "auto"; then
CPPFLAGS=-I$srcdir
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
#define SLJIT_CONFIG_AUTO 1
#include "src/sljit/sljitConfigCPU.h"
#include "deps/sljit/sljit_src/sljitConfigCPU.h"
#if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED)
#error unsupported
#endif]])], enable_jit=yes, enable_jit=no)
Expand Down
3 changes: 2 additions & 1 deletion src/config.h.generic
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,8 @@ sure both macros are undefined; an emulation function will then be used. */
/* Define to 1 if you have the <unistd.h> header file. */
/* #undef HAVE_UNISTD_H */

/* Define to 1 if the compiler supports simple visibility declarations. */
/* Define to 1 if the compiler supports GCC compatible visibility
declarations. */
/* #undef HAVE_VISIBILITY */

/* Define to 1 if you have the <wchar.h> header file. */
Expand Down
1 change: 1 addition & 0 deletions src/pcre2.h.generic
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ released, the numbers must not be changed. */
#define PCRE2_ERROR_INTERNAL_DUPMATCH (-65)
#define PCRE2_ERROR_DFA_UINVALID_UTF (-66)
#define PCRE2_ERROR_INVALIDOFFSET (-67)
#define PCRE2_ERROR_JIT_UNSUPPORTED (-68)


/* Request types for pcre2_pattern_info() */
Expand Down

0 comments on commit 89627d9

Please sign in to comment.