From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 7 Feb 2019 15:32:47 +0000 (+0200)
Subject: Minor fix for unexec builds.
X-Git-Tag: emacs-27.0.90~3652
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbb1a8bc1a285c7ed8817bac533ed4a096c391ac;p=emacs.git

Minor fix for unexec builds.

* src/emacs.c (main): Fix assertions and logic for pdump
loading in builds that can both unexec and pdump.
---

diff --git a/src/emacs.c b/src/emacs.c
index 87de181725d..3f964a16041 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -897,10 +897,13 @@ main (int argc, char **argv)
     }
   else
     {
-      eassert (!initialized);
       eassert (!temacs);
+#ifndef HAVE_UNEXEC
+      eassert (!initialized);
+#endif
 #ifdef HAVE_PDUMPER
-      attempt_load_pdump = true;
+      if (!initialized)
+	attempt_load_pdump = true;
 #endif
     }