mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

make standard emacs compilable again

Browse Source
This commit is contained in:
Andrea Corallo 2020-01-01 21:13:13 +01:00
parent 3ba1b52e27
commit 11192b29ad
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -3748,8 +3748,6 @@ if test "${with_nativecomp}" != "no"; then
LIBGCCJIT_LIB="-lgccjit -ldl"
COMP_OBJ+=comp.o
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])
else
AC_MSG_ERROR([elisp native compiler requested but libgccjit not found.
If you are sure you want Emacs compiled without elisp native compiler, pass
@ -3757,6 +3755,8 @@ If you are sure you want Emacs compiled without elisp native compiler, pass
to configure.])
fi
fi
AC_DEFINE_UNQUOTED(NATIVE_ELISP_SUFFIX, ".eln",
[System extension for native compiled elisp])
AC_SUBST(HAVE_NATIVE_COMP)
AC_SUBST(LIBGCCJIT_LIB)
AC_SUBST(COMP_OBJ)

6
lisp/Makefile.in
View File

@ -332,7 +332,13 @@ compile-first: $(COMPILE_FIRST)
.PHONY: compile-targets
# TARGETS is set dynamically in the recursive call from 'compile-main'.
# Do not build comp.el unless necessary not to exceed max-specpdl-size and
# max-lisp-eval-depth in normal builds.
ifneq ($(HAVE_NATIVE_COMP),yes)
compile-targets: $(filter-out ./emacs-lisp/comp.elc,$(TARGETS))
else
compile-targets: $(TARGETS)
endif
# Compile all the Elisp files that need it. Beware: it approximates
# 'no-byte-compile', so watch out for false-positives!

4
src/comp.h
View File

@ -29,8 +29,6 @@ enum {
#endif
};
#ifdef HAVE_NATIVE_COMP
#include <dynlib.h>
struct Lisp_Native_Comp_Unit
@ -43,6 +41,8 @@ struct Lisp_Native_Comp_Unit
dynlib_handle_ptr handle;
};
#ifdef HAVE_NATIVE_COMP
INLINE bool
NATIVE_COMP_UNITP (Lisp_Object a)
{

5
src/lread.c
View File

@ -4464,8 +4464,9 @@ defsubr (union Aligned_Lisp_Subr *aname)
XSETPVECTYPE (sname, PVEC_SUBR);
XSETSUBR (tem, sname);
set_symbol_function (sym, tem);
if (NATIVE_COMP_FLAG)
Vcomp_subr_list = Fcons (tem, Vcomp_subr_list);
#ifdef HAVE_NATIVE_COMP
Vcomp_subr_list = Fcons (tem, Vcomp_subr_list);
#endif
}
#ifdef NOTDEF /* Use fset in subr.el now! */

2
src/pdumper.c
View File

@ -5296,6 +5296,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
dump_write_word_to_dump (dump_base, reloc_offset, value);
break;
}
#ifdef HAVE_NATIVE_COMP
case RELOC_NATIVE_COMP_UNIT:
{
struct Lisp_Native_Comp_Unit *comp_u =
@ -5323,6 +5324,7 @@ dump_do_dump_relocation (const uintptr_t dump_base,
subr->function.a0 = func;
break;
}
#endif
case RELOC_BIGNUM:
{
struct Lisp_Bignum *bignum = dump_ptr (dump_base, reloc_offset);