From: Andrea Corallo Date: Sun, 8 Sep 2019 08:11:36 +0000 (+0200) Subject: rename HAVE_LIBGCCJIT -> HAVE_NATIVE_COMP X-Git-Tag: emacs-28.0.90~2727^2~1204 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=06ad74581385cd1930a073b2fda314230b254608;p=emacs.git rename HAVE_LIBGCCJIT -> HAVE_NATIVE_COMP --- diff --git a/configure.ac b/configure.ac index a36a2f32428..0cfd80bb2e8 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/src/comp.c b/src/comp.c index 00e15601998..2b6f8bf0536 100644 --- a/src/comp.c +++ b/src/comp.c @@ -20,7 +20,7 @@ along with GNU Emacs. If not, see . */ #include -#ifdef HAVE_LIBGCCJIT +#ifdef HAVE_NATIVE_COMP #include #include @@ -3283,4 +3283,4 @@ syms_of_comp (void) comp_speed = DEFAULT_SPEED; } -#endif /* HAVE_LIBGCCJIT */ +#endif /* HAVE_NATIVE_COMP */ diff --git a/src/emacs.c b/src/emacs.c index c59a70988b7..90ab7ac1e8e 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -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 diff --git a/src/lread.c b/src/lread.c index b10743f980c..f1b17edd011 100644 --- a/src/lread.c +++ b/src/lread.c @@ -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