From 39bdb3f6f54cdba80f1efbecab4bbb08428e7cc8 Mon Sep 17 00:00:00 2001
From: Andrea Corallo
Date: Fri, 4 Dec 2020 22:31:36 +0100
Subject: 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.
---
 src/data.c    | 2 +-
 src/pdumper.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

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)
   defsubr (&Ssubr_arity);
   defsubr (&Ssubr_name);
   defsubr (&Ssubr_native_elisp_p);
-#ifdef HAVE_NATIVE_COMP
   defsubr (&Ssubr_native_lambda_list);
+#ifdef HAVE_NATIVE_COMP
   defsubr (&Ssubr_native_comp_unit);
   defsubr (&Snative_comp_unit_file);
   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)
     }
 }
 
+#ifdef HAVE_NATIVE_COMP
 static void
 dump_cold_native_subr (struct dump_context *ctx, Lisp_Object subr)
 {
@@ -3425,6 +3426,7 @@ dump_cold_native_subr (struct dump_context *ctx, Lisp_Object subr)
   const char *c_name = XSUBR (subr)->native_c_name[0];
   dump_write (ctx, c_name, 1 + strlen (c_name));
 }
+#endif
 
 static void
 dump_drain_cold_data (struct dump_context *ctx)
@@ -3469,9 +3471,11 @@ dump_drain_cold_data (struct dump_context *ctx)
         case COLD_OP_BIGNUM:
           dump_cold_bignum (ctx, data);
           break;
+#ifdef HAVE_NATIVE_COMP
 	case COLD_OP_NATIVE_SUBR:
 	  dump_cold_native_subr (ctx, data);
 	  break;
+#endif
         default:
           emacs_abort ();
         }
-- 
cgit v1.2.1