scratch/no-purespace 2fecbfca337 10/11: Fixup for "Unexec removal: Main part"

[Pip Cet]

branch: scratch/no-purespace
commit 2fecbfca337a0baee63adaa515b66891f73ea4e0
Author: Pip Cet <pipcet@protonmail.com>
Commit: Pip Cet <pipcet@protonmail.com>

    Fixup for "Unexec removal: Main part"
    
    * src/emacs.c (main): Remove 'unexec'-specific code.
    * lisp/loadup.el:
    * lisp/startup.el: Remove unexec-specific code.
---
 lisp/loadup.el  | 6 ++----
 lisp/startup.el | 4 ++--
 src/emacs.c     | 6 ------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/lisp/loadup.el b/lisp/loadup.el
index 6d1e13f44bf..d1d75b893a6 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -57,7 +57,7 @@
 ;; Add subdirectories to the load-path for files that might get
 ;; autoloaded when bootstrapping or running Emacs normally.
 ;; This is because PATH_DUMPLOADSEARCH is just "../lisp".
-(if (or (member dump-mode '("bootstrap" "pbootstrap"))
+(if (or (member dump-mode '("pbootstrap"))
        ;; FIXME this is irritatingly fragile.
         (and (stringp (nth 4 command-line-args))
              (string-match "^unidata-gen\\(\\.elc?\\)?$"
@@ -635,8 +635,6 @@ directory got moved.  This is set to be a pair in the form 
of:
               (error nil))))))
   (if dump-mode
       (let ((output (cond ((equal dump-mode "pdump") "emacs.pdmp")
-                          ((equal dump-mode "dump") "emacs")
-                          ((equal dump-mode "bootstrap") "emacs")
                           ((equal dump-mode "pbootstrap") 
"bootstrap-emacs.pdmp")
                           (t (error "Unrecognized dump mode %s" dump-mode)))))
         (when (and (featurep 'native-compile)
@@ -680,7 +678,7 @@ directory got moved.  This is set to be a pair in the form 
of:
                          (eq system-type 'android))
                      ;; Don't bother adding another name if we're just
                      ;; building bootstrap-emacs.
-                     (member dump-mode '("pbootstrap" "bootstrap"))))
+                     (member dump-mode '("pbootstrap"))))
             (let ((name (format "emacs-%s.%d" emacs-version 
emacs-build-number))
                   (exe (if (eq system-type 'windows-nt) ".exe" "")))
               (while (string-match "[^-+_.a-zA-Z0-9]+" name)
diff --git a/lisp/startup.el b/lisp/startup.el
index 738eec772ec..2b19d6cfb42 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1104,7 +1104,7 @@ init-file, or to a default value if loading is not 
possible."
                ;; Else, perhaps the user init file was compiled
                (when (and (equal (file-name-extension user-init-file) "eln")
                           ;; The next test is for builds without native
-                          ;; compilation support or builds with unexec.
+                          ;; compilation support.
                           (boundp 'comp-eln-to-el-h))
                  (if-let (source (gethash (file-name-nondirectory
                                            user-init-file)
@@ -2523,7 +2523,7 @@ A fancy display is used on graphic displays, normal 
otherwise."
 (defalias 'about-emacs #'display-about-screen)
 (defalias 'display-splash-screen #'display-startup-screen)
 
-;; This avoids byte-compiler warning in the unexec build.
+;; This avoids byte-compiler warning in non-pdumper builds.
 (declare-function pdumper-stats "pdumper.c" ())
 
 (defun command-line-1 (args-left)
diff --git a/src/emacs.c b/src/emacs.c
index 9a45e9ffec1..17a5fc47c1f 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1380,12 +1380,6 @@ main (int argc, char **argv)
     run_time_remap (argv[0]);
 #endif
 
-/* If using unexmacosx.c (set by s/darwin.h), we must do this. */
-#if defined DARWIN_OS && defined HAVE_UNEXEC
-  if (!initialized)
-    unexec_init_emacs_zone ();
-#endif
-
   init_standard_fds ();
   atexit (close_output_streams);