From: Andrea Corallo <akrl@sdf.org>
Date: Wed, 25 Dec 2019 16:07:55 +0000 (+0100)
Subject: move late relocs after emacs relocations
X-Git-Tag: emacs-28.0.90~2727^2~879
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=726d8c5bae847a3240b758a1d25135865e9304f0;p=emacs.git

move late relocs after emacs relocations
---

diff --git a/src/pdumper.c b/src/pdumper.c
index d66c4e99642..422bec47a66 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -348,7 +348,7 @@ enum reloc_phase
   {
     /* First to run.  Place here every relocation with no dependecy.  */
     EARLY_RELOCS,
-    /* Run just after EARLY_RELOCS.  */
+    /* Running after emacs relocations.  */
     LATE_RELOCS,
     /* Relocated at the very last after all hooks has been run.  All
        lisp machinery (allocation included) is at disposal.  */
@@ -5563,8 +5563,8 @@ pdumper_load (const char *dump_filename)
   dump_public.end = dump_public.start + dump_size;
 
   dump_do_all_dump_reloc_for_phase (header, dump_base, EARLY_RELOCS);
-  dump_do_all_dump_reloc_for_phase (header, dump_base, LATE_RELOCS);
   dump_do_all_emacs_relocations (header, dump_base);
+  dump_do_all_dump_reloc_for_phase (header, dump_base, LATE_RELOCS);
 
   dump_mmap_discard_contents (&sections[DS_DISCARDABLE]);
   for (int i = 0; i < ARRAYELTS (sections); ++i)