[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master c4b02da 1/2: Rename batch-byte-native-compile-for-bootstrap (bug#
From: |
Andrea Corallo |
Subject: |
master c4b02da 1/2: Rename batch-byte-native-compile-for-bootstrap (bug#48743) |
Date: |
Tue, 1 Jun 2021 12:12:35 -0400 (EDT) |
branch: master
commit c4b02dad9bdf233888164067d5942c0d7642cae2
Author: Andrea Corallo <akrl@sdf.org>
Commit: Andrea Corallo <akrl@sdf.org>
Rename batch-byte-native-compile-for-bootstrap (bug#48743)
* lisp/Makefile.in : Rename `batch-byte-native-compile-for-bootstrap'
-> `batch-byte+native-compile.
* lisp/emacs-lisp/bytecomp.el (byte+native-compile)
(byte-compile-file): Rename
`batch-byte-native-compile-for-bootstrap' ->
`batch-byte+native-compile + `byte-native-for-bootstrap' ->
`byte+native-compile'.
* lisp/emacs-lisp/comp.el (comp-spill-lap-function, comp-final)
(batch-native-compile, batch-byte+native-compile): Likewise.
* lisp/emacs-lisp/bytecomp.el (byte+native-compile)
(byte-compile-file): Likewise.
* test/src/comp-tests.el (comp-tests-bootstrap): Rename
`byte-native-for-bootstrap' -> `byte+native-compile'.
---
lisp/Makefile.in | 4 ++--
lisp/emacs-lisp/bytecomp.el | 4 ++--
lisp/emacs-lisp/comp.el | 10 +++++-----
test/src/comp-tests.el | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 8e0d9c4..431217a 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -274,7 +274,7 @@ $(THEFILE)c:
ifeq ($(HAVE_NATIVE_COMP),yes)
$(AM_V_ELC)$(emacs) $(BYTE_COMPILE_FLAGS) \
-l comp -f byte-compile-refresh-preloaded \
- -f batch-byte-native-compile-for-bootstrap $(THEFILE)
+ -f batch-byte+native-compile $(THEFILE)
else
$(AM_V_ELC)$(emacs) $(BYTE_COMPILE_FLAGS) \
-l bytecomp -f byte-compile-refresh-preloaded \
@@ -295,7 +295,7 @@ endif
ifeq ($(HAVE_NATIVE_COMP),yes)
.el.elc:
$(AM_V_ELC)$(emacs) $(BYTE_COMPILE_FLAGS) \
- -l comp -f batch-byte-native-compile-for-bootstrap $<
+ -l comp -f batch-byte+native-compile $<
else
.el.elc:
$(AM_V_ELC)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $<
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 86c5d32..96a0da9 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -606,7 +606,7 @@ Each element is (INDEX . VALUE)")
"Non nil while native compiling.")
(defvar byte-native-qualities nil
"To spill default qualities from the compiled file.")
-(defvar byte-native-for-bootstrap nil
+(defvar byte+native-compile nil
"Non nil while compiling for bootstrap."
;; During bootstrap we produce both the .eln and the .elc together.
;; Because the make target is the later this has to be produced as
@@ -2109,7 +2109,7 @@ See also `emacs-lisp-byte-compile-and-load'."
;; recompiled). Previously this was accomplished by
;; deleting target-file before writing it.
(if byte-native-compiling
- (if byte-native-for-bootstrap
+ (if byte+native-compile
;; Defer elc final renaming.
(setf byte-to-native-output-file
(cons tempfile target-file))
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index fa5a452..b9c80d1 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -1337,7 +1337,7 @@ clashes."
(unless (comp-ctxt-output comp-ctxt)
(setf (comp-ctxt-output comp-ctxt) (comp-el-to-eln-filename
filename
- (when byte-native-for-bootstrap
+ (when byte+native-compile
(car (last
native-comp-eln-load-path))))))
(setf (comp-ctxt-speed comp-ctxt) (alist-get 'native-comp-speed
byte-native-qualities)
@@ -3643,7 +3643,7 @@ Prepare every function for final compilation and drive
the C back-end."
;; unless during bootstrap or async compilation (bug#45056). GCC
;; leaks memory but also interfere with the ability of Emacs to
;; detect when a sub-process completes (TODO understand why).
- (if (or byte-native-for-bootstrap comp-async-compilation)
+ (if (or byte+native-compile comp-async-compilation)
(comp-final1)
;; Call comp-final1 in a child process.
(let* ((output (comp-ctxt-output comp-ctxt))
@@ -4171,7 +4171,7 @@ it won’t work in an interactive Emacs.
Native compilation equivalent to `batch-byte-compile'."
(comp-ensure-native-compiler)
(cl-loop for file in command-line-args-left
- if (or (null byte-native-for-bootstrap)
+ if (or (null byte+native-compile)
(cl-notany (lambda (re) (string-match re file))
native-comp-bootstrap-deny-list))
do (comp--native-compile file)
@@ -4179,7 +4179,7 @@ Native compilation equivalent to `batch-byte-compile'."
do (byte-compile-file file)))
;;;###autoload
-(defun batch-byte-native-compile-for-bootstrap ()
+(defun batch-byte+native-compile ()
"Like `batch-native-compile', but used for bootstrap.
Generate .elc files in addition to the .eln files.
Force the produced .eln to be outputted in the eln system
@@ -4190,7 +4190,7 @@ compile."
(if (equal (getenv "NATIVE_DISABLED") "1")
(batch-byte-compile)
(cl-assert (length= command-line-args-left 1))
- (let ((byte-native-for-bootstrap t)
+ (let ((byte+native-compile t)
(byte-to-native-output-file nil))
(batch-native-compile)
(pcase byte-to-native-output-file
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index be02c30..fb9441e 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -53,7 +53,7 @@
"Compile the compiler and load it to compile it-self.
Check that the resulting binaries do not differ."
:tags '(:expensive-test :nativecomp)
- (let* ((byte-native-for-bootstrap t) ; FIXME HACK
+ (let* ((byte+native-compile t) ; FIXME HACK
(comp-src (expand-file-name "../../../lisp/emacs-lisp/comp.el"
(ert-resource-directory)))
(comp1-src (make-temp-file "stage1-" nil ".el"))