diff options
| -rw-r--r-- | lisp/emacs-lisp/generate-lisp-file.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 2 | ||||
| -rw-r--r-- | lisp/startup.el | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 4 | ||||
| -rw-r--r-- | src/comp.c | 8 |
5 files changed, 12 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/generate-lisp-file.el b/lisp/emacs-lisp/generate-lisp-file.el index 167cdfbf826..d878784ba32 100644 --- a/lisp/emacs-lisp/generate-lisp-file.el +++ b/lisp/emacs-lisp/generate-lisp-file.el @@ -103,7 +103,7 @@ if it's also byte-compiled)." (insert ";; no-byte-" "compile: t\n")) (unless autoloads (insert ";; no-update-autoloads: t\n")) - (unless native-comp-deferred-compilation + (unless native-comp-jit-compilation (insert ";; no-native-" "compile: t\n")) (when coding (insert (format ";; coding: %s\n" diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index ba1183f686b..1c339d08148 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el @@ -220,7 +220,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map." Load the compiled code when finished. Use `emacs-lisp-byte-compile-and-load' in combination with -`native-comp-deferred-compilation' set to t to achieve asynchronous +`native-comp-jit-compilation' set to t to achieve asynchronous native compilation." (interactive nil emacs-lisp-mode) (emacs-lisp--before-compile-buffer) diff --git a/lisp/startup.el b/lisp/startup.el index ddbb39df857..b0f019d704e 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -542,7 +542,7 @@ DIRS are relative." (setq comp--compilable t)) (defvar native-comp-eln-load-path) -(defvar native-comp-deferred-compilation) +(defvar native-comp-jit-compilation) (defvar native-comp-enable-subr-trampolines) (defvar startup--original-eln-load-path nil @@ -597,7 +597,7 @@ It is the default value of the variable `top-level'." ;; in this session. This is necessary if libgccjit is not ;; available on MS-Windows, but Emacs was built with ;; native-compilation support. - (setq native-comp-deferred-compilation nil + (setq native-comp-jit-compilation nil native-comp-enable-subr-trampolines nil)) ;; Form `native-comp-eln-load-path'. diff --git a/lisp/subr.el b/lisp/subr.el index 56c8377da87..db33483f509 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -1898,6 +1898,10 @@ instead; it will indirectly limit the specpdl stack size as well.") 'native-comp-enable-subr-trampolines "29.1") +(make-obsolete-variable 'native-comp-deferred-compilation + 'native-comp-jit-compilation + "29.1") + ;;;; Alternate names for functions - these are not being phased out. diff --git a/src/comp.c b/src/comp.c index ba3ed95bcce..019d1e78fff 100644 --- a/src/comp.c +++ b/src/comp.c @@ -5173,7 +5173,7 @@ maybe_defer_native_compilation (Lisp_Object function_name, if (!load_gccjit_if_necessary (false)) return; - if (!native_comp_deferred_compilation + if (!native_comp_jit_compilation || noninteractive || !NILP (Vpurify_flag) || !COMPILEDP (definition) @@ -5677,13 +5677,13 @@ For internal use. */); doc: /* Non-nil when comp.el can be native compiled. For internal use. */); /* Compiler control customizes. */ - DEFVAR_BOOL ("native-comp-deferred-compilation", - native_comp_deferred_compilation, + DEFVAR_BOOL ("native-comp-jit-compilation", + native_comp_jit_compilation, doc: /* If non-nil compile loaded .elc files asynchronously. After compilation, each function definition is updated to the native compiled one. */); - native_comp_deferred_compilation = true; + native_comp_jit_compilation = true; DEFSYM (Qnative_comp_speed, "native-comp-speed"); DEFSYM (Qnative_comp_debug, "native-comp-debug"); |