From: Andrea Corallo <akrl@sdf.org>
Date: Thu, 13 Aug 2020 10:22:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~501
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=46e7613ad3b88807d25cfab3d78bf46c9e2fe13e;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

46e7613ad3b88807d25cfab3d78bf46c9e2fe13e
diff --cc src/pdumper.c
index de9c06c9d2c,bc41afc7c5a..c55b6f7bb43
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@@ -4311,12 -4131,11 +4234,12 @@@ types.  */
    /* Emit instructions for Emacs to execute when loading the dump.
       Note that this relocation information ends up in the cold section
       of the dump.  */
 -  drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
 -		    &ctx->dump_relocs, &ctx->header.dump_relocs);
 +  for (int i = 0; i < RELOC_NUM_PHASES; ++i)
 +    drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
 +		      &ctx->dump_relocs[i], &ctx->header.dump_relocs[i]);
-   unsigned number_hot_relocations = ctx->number_hot_relocations;
+   dump_off number_hot_relocations = ctx->number_hot_relocations;
    ctx->number_hot_relocations = 0;
-   unsigned number_discardable_relocations = ctx->number_discardable_relocations;
+   dump_off number_discardable_relocations = ctx->number_discardable_relocations;
    ctx->number_discardable_relocations = 0;
    drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
  		    &ctx->object_starts, &ctx->header.object_starts);