diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-10-10 18:18:09 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-10-10 18:47:45 +0200 |
| commit | 8b135af5bbdfb6cf561f92a02ef92e855acc04dd (patch) | |
| tree | e6b4039137f54f29b2dbd853fcc63aa7a88c1842 /lisp | |
| parent | 77fa6befb478f49a47ef1cee88e2c791e0037617 (diff) | |
| download | emacs-8b135af5bbdfb6cf561f92a02ef92e855acc04dd.tar.gz emacs-8b135af5bbdfb6cf561f92a02ef92e855acc04dd.tar.bz2 emacs-8b135af5bbdfb6cf561f92a02ef92e855acc04dd.zip | |
Provide feature nativecomp and make use of it
* lisp/emacs-lisp/comp.el (comp-ensure-native-compiler): Use
`featurep' to identify if the native compiler is available.
* lisp/emacs-lisp/nadvice.el (advice--add-function): Likewise.
* lisp/emacs-lisp/package.el (package--delete-directory): Likewise.
* lisp/loadup.el: Likewise.
* src/comp.c (syms_of_comp): Provide feature nativecomp.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/comp.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/nadvice.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 | ||||
| -rw-r--r-- | lisp/loadup.el | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el index d860fa31f0b..a4f2b6c36c7 100644 --- a/lisp/emacs-lisp/comp.el +++ b/lisp/emacs-lisp/comp.el @@ -422,7 +422,7 @@ CFG is mutated by a pass.") Raise an error otherwise. To be used by all entry points." (cond - ((null (boundp 'comp-ctxt)) + ((null (featurep 'nativecomp)) (error "Emacs not compiled with native compiler support (--with-nativecomp)")) ((null (native-comp-available-p)) (error "Cannot find libgccjit")))) diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el index 03961325856..8b60c08440b 100644 --- a/lisp/emacs-lisp/nadvice.el +++ b/lisp/emacs-lisp/nadvice.el @@ -318,7 +318,7 @@ is also interactive. There are 3 cases: ;;;###autoload (defun advice--add-function (where ref function props) - (when (and (boundp 'comp-ctxt) + (when (and (featurep 'nativecomp) (subr-primitive-p (gv-deref ref))) (let ((subr-name (intern (subr-name (gv-deref ref))))) ;; Requiring the native compiler to advice `macroexpand' cause a diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index ac1396f88df..c0125e64727 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2207,7 +2207,7 @@ If some packages are not installed propose to install them." "Delete DIR recursively. Clean-up the corresponding .eln files if Emacs is native compiled." - (when (boundp 'comp-ctxt) + (when (featurep 'nativecomp) (cl-loop for file in (directory-files-recursively dir ".el\\'") do (comp-clean-up-stale-eln (comp-el-to-eln-filename file)))) diff --git a/lisp/loadup.el b/lisp/loadup.el index 91126703d18..827087f763c 100644 --- a/lisp/loadup.el +++ b/lisp/loadup.el @@ -449,7 +449,7 @@ lost after dumping"))) ;; At this point, we're ready to resume undo recording for scratch. (buffer-enable-undo "*scratch*") -(when (boundp 'comp-ctxt) +(when (featurep 'nativecomp) ;; Fix the compilation unit filename to have it working when ;; when installed or if the source directory got moved. This is set to be ;; a pair in the form: (rel-path-from-install-bin . rel-path-from-local-bin). @@ -510,7 +510,7 @@ lost after dumping"))) ((equal dump-mode "bootstrap") "emacs") ((equal dump-mode "pbootstrap") "bootstrap-emacs.pdmp") (t (error "unrecognized dump mode %s" dump-mode))))) - (when (and (boundp 'comp-ctxt) + (when (and (featurep 'nativecomp) (equal dump-mode "pdump")) ;; Don't enable this before bootstrap is completed the as the ;; compiler infrastructure may not be usable. |