From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 1 Jan 2020 20:13:13 +0000 (+0100)
Subject: make standard emacs compilable again
X-Git-Tag: emacs-28.0.90~2727^2~856
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=11192b29adf4ee500f5056d1b02d35908f858b53;p=emacs.git

make standard emacs compilable again
---

diff --git a/configure.ac b/configure.ac
index 8c8b57c1079..247484a8501 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index cfc6f494991..5793b6474dc 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -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!
diff --git a/src/comp.h b/src/comp.h
index 33b73548009..86fa54f5158 100644
--- a/src/comp.h
+++ b/src/comp.h
@@ -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)
 {
diff --git a/src/lread.c b/src/lread.c
index 1c5268d0dad..d6d13861417 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -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!  */
diff --git a/src/pdumper.c b/src/pdumper.c
index 85809c9978f..ae8fe014e0e 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -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);