master ae2ce54a115 2/2: Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs

branch: master
commit ae2ce54a11598469506250e7e4203c0fb98955fd
Merge: 27771b1ca51 3c0bc3f2ebe
Author: Eli Zaretskii <[email protected]>
Commit: Eli Zaretskii <[email protected]>

    Merge branch 'master' of git.savannah.gnu.org:/srv/git/emacs
---
 src/pdumper.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pdumper.c b/src/pdumper.c
index 755b27c8773..a2fc1c255e5 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -269,10 +269,12 @@ enum
   {
    DUMP_RELOC_TYPE_BITS = 5,
 
-   /* Minimum alignment required by dump file format.  Although this can
-      be any integer power of 2 up to alignof (Lisp_Alignment),
-      larger values help dump_reloc_set_offset support larger offsets.  */
-   DUMP_RELOCATION_ALIGNMENT = alignof (Lisp_Object),
+   /* Minimum alignment required by dump file format.  Lisp_Objects and raw
+      pointers can both be relocated, so this can be any integer power of 2
+      up to min (alignof (Lisp_Object), alignof (void *)).
+      Larger values help dump_reloc_set_offset support larger offsets.  */
+   DUMP_RELOCATION_ALIGNMENT = min (alignof (Lisp_Object),
+				    alignof (void *)),
 
    /* The alignment granularity (in bytes) for objects we store in the
       dump.  Always suitable for heap objects; may be more aligned.  */