procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename HAVE_LIBGCCJIT -> HAVE_NATIVE_COMP

Browse source
This commit is contained in:
Andrea Corallo 2019-09-08 10:11:36 +02:00
parent 17259826f2
commit 06ad745813
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.ac
View file

@ -3672,15 +3672,15 @@ fi
AC_SUBST(LIBZ)
### Emacs Lisp native compiler support
HAVE_LIBGCCJIT=no
HAVE_NATIVE_COMP=no
LIBGCCJIT_LIB=
COMP_OBJ=
if test "${with_nativecomp}" != "no"; then
AC_CHECK_LIB(gccjit, gcc_jit_context_acquire, HAVE_LIBGCCJIT=yes, , -lgccjit)
if test "${HAVE_LIBGCCJIT}" = "yes"; then
AC_CHECK_LIB(gccjit, gcc_jit_context_acquire, HAVE_NATIVE_COMP=yes, , -lgccjit)
if test "${HAVE_NATIVE_COMP}" = "yes"; then
LIBGCCJIT_LIB="-lgccjit -ldl"
COMP_OBJ="dynlib.o comp.o"
AC_DEFINE(HAVE_LIBGCCJIT, 1, [Define to 1 if you have the libgccjit library (-lgccjit).])
AC_DEFINE(HAVE_NATIVE_COMP, 1, [Define to 1 if you have the libgccjit library (-lgccjit).])
AC_DEFINE_UNQUOTED(NATIVE_ELISP_SUFFIX, ".eln",
[System extension for native compiled elisp])
fi

4
src/comp.c
View file

@ -20,7 +20,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include <config.h>
#ifdef HAVE_LIBGCCJIT
#ifdef HAVE_NATIVE_COMP
#include <stdlib.h>
#include <stdio.h>
@ -3283,4 +3283,4 @@ syms_of_comp (void)
comp_speed = DEFAULT_SPEED;
}
#endif /* HAVE_LIBGCCJIT */
#endif /* HAVE_NATIVE_COMP */

2
src/emacs.c
View file

@ -1598,7 +1598,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
init_json ();
#endif
#ifdef HAVE_LIBGCCJIT
#ifdef HAVE_NATIVE_COMP
if (!initialized)
syms_of_comp ();
#endif

6
src/lread.c
View file

@ -1281,7 +1281,7 @@ Return t if the file exists and loads successfully. */)
bool is_module = false;
#endif
#ifdef HAVE_LIBGCCJIT
#ifdef HAVE_NATIVE_COMP
bool is_native_elisp = suffix_p (found, NATIVE_ELISP_SUFFIX);
#else
bool is_native_elisp = false;
@ -1486,7 +1486,7 @@ Return t if the file exists and loads successfully. */)
}
else if (is_native_elisp)
{
#ifdef HAVE_LIBGCCJIT
#ifdef HAVE_NATIVE_COMP
specbind (Qcurrent_load_list, Qnil);
LOADHIST_ATTACH (found);
Fnative_elisp_load (found);
@ -4896,7 +4896,7 @@ to the specified file name if a suffix is allowed or required. */);
Fcons (build_pure_c_string (MODULES_SECONDARY_SUFFIX), Vload_suffixes);
#endif
#endif
#ifdef HAVE_LIBGCCJIT
#ifdef HAVE_NATIVE_COMP
Vload_suffixes = Fcons (build_pure_c_string (NATIVE_ELISP_SUFFIX), Vload_suffixes);
#endif