diff options
| author | Andrea Corallo | 2020-12-04 22:31:36 +0100 |
|---|---|---|
| committer | Andrea Corallo | 2020-12-04 23:21:15 +0100 |
| commit | 39bdb3f6f54cdba80f1efbecab4bbb08428e7cc8 (patch) | |
| tree | e9bbb5e96cad61716ab68de5956eccc515f3eb9d | |
| parent | dcfd367d282ab37f00373a424fd193022a8f4bf6 (diff) | |
| download | emacs-39bdb3f6f54cdba80f1efbecab4bbb08428e7cc8.tar.gz emacs-39bdb3f6f54cdba80f1efbecab4bbb08428e7cc8.zip | |
Vanilla build warning clean-up
* lisp/emacs-lisp/disass.el (native-comp-unit-file)
(subr-native-comp-unit): Declare function.
* lisp/progmodes/elisp-mode.el (native-compile): Likewise.
* lisp/emacs-lisp/package.el (comp-el-to-eln-filename): Likewise.
* lisp/startup.el (normal-top-level): Silence warning.
* src/data.c (syms_of_data): 'Ssubr_native_lambda_list' is always
defined.
* src/pdumper.c (dump_cold_native_subr): Move under ifdefs.
(dump_drain_cold_data): Add ifdefs.
| -rw-r--r-- | lisp/emacs-lisp/disass.el | 3 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 1 | ||||
| -rw-r--r-- | lisp/progmodes/elisp-mode.el | 1 | ||||
| -rw-r--r-- | lisp/startup.el | 1 | ||||
| -rw-r--r-- | src/data.c | 2 | ||||
| -rw-r--r-- | src/pdumper.c | 4 |
6 files changed, 10 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el index 7e7db7b441d..7fb370f5df5 100644 --- a/lisp/emacs-lisp/disass.el +++ b/lisp/emacs-lisp/disass.el | |||
| @@ -75,7 +75,8 @@ redefine OBJECT if it is a symbol." | |||
| 75 | (disassemble-internal object indent nil))) | 75 | (disassemble-internal object indent nil))) |
| 76 | nil) | 76 | nil) |
| 77 | 77 | ||
| 78 | 78 | (declare-function native-comp-unit-file "data.c") | |
| 79 | (declare-function subr-native-comp-unit "data.c") | ||
| 79 | (cl-defun disassemble-internal (obj indent interactive-p) | 80 | (cl-defun disassemble-internal (obj indent interactive-p) |
| 80 | (let ((macro 'nil) | 81 | (let ((macro 'nil) |
| 81 | (name (when (symbolp obj) | 82 | (name (when (symbolp obj) |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 0ee2e58d528..e980f8841e0 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -2221,6 +2221,7 @@ If some packages are not installed propose to install them." | |||
| 2221 | (equal (cadr (assq (package-desc-name pkg) package-alist)) | 2221 | (equal (cadr (assq (package-desc-name pkg) package-alist)) |
| 2222 | pkg)) | 2222 | pkg)) |
| 2223 | 2223 | ||
| 2224 | (declare-function comp-el-to-eln-filename "comp.c") | ||
| 2224 | (defun package--delete-directory (dir) | 2225 | (defun package--delete-directory (dir) |
| 2225 | "Delete DIR recursively. | 2226 | "Delete DIR recursively. |
| 2226 | Clean-up the corresponding .eln files if Emacs is native | 2227 | Clean-up the corresponding .eln files if Emacs is native |
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el index dac3aaf2a53..13bba7f77a8 100644 --- a/lisp/progmodes/elisp-mode.el +++ b/lisp/progmodes/elisp-mode.el | |||
| @@ -203,6 +203,7 @@ All commands in `lisp-mode-shared-map' are inherited by this map.") | |||
| 203 | (byte-recompile-file buffer-file-name nil 0) | 203 | (byte-recompile-file buffer-file-name nil 0) |
| 204 | (load buffer-file-name)) | 204 | (load buffer-file-name)) |
| 205 | 205 | ||
| 206 | (declare-function native-compile "comp") | ||
| 206 | (defun emacs-lisp-native-compile-and-load () | 207 | (defun emacs-lisp-native-compile-and-load () |
| 207 | "Native-compile synchronously the current file (if it has changed). | 208 | "Native-compile synchronously the current file (if it has changed). |
| 208 | Load the compiled code when finished. | 209 | Load the compiled code when finished. |
diff --git a/lisp/startup.el b/lisp/startup.el index 2beeaa195d0..f9de7fa94f6 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -535,6 +535,7 @@ It is the default value of the variable `top-level'." | |||
| 535 | (startup--xdg-or-homedot startup--xdg-config-home-emacs nil)) | 535 | (startup--xdg-or-homedot startup--xdg-config-home-emacs nil)) |
| 536 | 536 | ||
| 537 | (when (featurep 'nativecomp) | 537 | (when (featurep 'nativecomp) |
| 538 | (defvar comp-eln-load-path) | ||
| 538 | (let ((path-env (getenv "EMACSNATIVELOADPATH"))) | 539 | (let ((path-env (getenv "EMACSNATIVELOADPATH"))) |
| 539 | (when path-env | 540 | (when path-env |
| 540 | (dolist (path (split-string path-env ":")) | 541 | (dolist (path (split-string path-env ":")) |
diff --git a/src/data.c b/src/data.c index 1435cb03779..fea39867c99 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -4055,8 +4055,8 @@ syms_of_data (void) | |||
| 4055 | defsubr (&Ssubr_arity); | 4055 | defsubr (&Ssubr_arity); |
| 4056 | defsubr (&Ssubr_name); | 4056 | defsubr (&Ssubr_name); |
| 4057 | defsubr (&Ssubr_native_elisp_p); | 4057 | defsubr (&Ssubr_native_elisp_p); |
| 4058 | #ifdef HAVE_NATIVE_COMP | ||
| 4059 | defsubr (&Ssubr_native_lambda_list); | 4058 | defsubr (&Ssubr_native_lambda_list); |
| 4059 | #ifdef HAVE_NATIVE_COMP | ||
| 4060 | defsubr (&Ssubr_native_comp_unit); | 4060 | defsubr (&Ssubr_native_comp_unit); |
| 4061 | defsubr (&Snative_comp_unit_file); | 4061 | defsubr (&Snative_comp_unit_file); |
| 4062 | defsubr (&Snative_comp_unit_set_file); | 4062 | defsubr (&Snative_comp_unit_set_file); |
diff --git a/src/pdumper.c b/src/pdumper.c index 1a7aee6343a..b3abbd66f0c 100644 --- a/src/pdumper.c +++ b/src/pdumper.c | |||
| @@ -3405,6 +3405,7 @@ dump_cold_bignum (struct dump_context *ctx, Lisp_Object object) | |||
| 3405 | } | 3405 | } |
| 3406 | } | 3406 | } |
| 3407 | 3407 | ||
| 3408 | #ifdef HAVE_NATIVE_COMP | ||
| 3408 | static void | 3409 | static void |
| 3409 | dump_cold_native_subr (struct dump_context *ctx, Lisp_Object subr) | 3410 | dump_cold_native_subr (struct dump_context *ctx, Lisp_Object subr) |
| 3410 | { | 3411 | { |
| @@ -3425,6 +3426,7 @@ dump_cold_native_subr (struct dump_context *ctx, Lisp_Object subr) | |||
| 3425 | const char *c_name = XSUBR (subr)->native_c_name[0]; | 3426 | const char *c_name = XSUBR (subr)->native_c_name[0]; |
| 3426 | dump_write (ctx, c_name, 1 + strlen (c_name)); | 3427 | dump_write (ctx, c_name, 1 + strlen (c_name)); |
| 3427 | } | 3428 | } |
| 3429 | #endif | ||
| 3428 | 3430 | ||
| 3429 | static void | 3431 | static void |
| 3430 | dump_drain_cold_data (struct dump_context *ctx) | 3432 | dump_drain_cold_data (struct dump_context *ctx) |
| @@ -3469,9 +3471,11 @@ dump_drain_cold_data (struct dump_context *ctx) | |||
| 3469 | case COLD_OP_BIGNUM: | 3471 | case COLD_OP_BIGNUM: |
| 3470 | dump_cold_bignum (ctx, data); | 3472 | dump_cold_bignum (ctx, data); |
| 3471 | break; | 3473 | break; |
| 3474 | #ifdef HAVE_NATIVE_COMP | ||
| 3472 | case COLD_OP_NATIVE_SUBR: | 3475 | case COLD_OP_NATIVE_SUBR: |
| 3473 | dump_cold_native_subr (ctx, data); | 3476 | dump_cold_native_subr (ctx, data); |
| 3474 | break; | 3477 | break; |
| 3478 | #endif | ||
| 3475 | default: | 3479 | default: |
| 3476 | emacs_abort (); | 3480 | emacs_abort (); |
| 3477 | } | 3481 | } |