master ad0c3409758 2/2: Bump DUMP_RELOCATION_ALIGNMENT to alignof (Lisp_Object)

Paul Eggert <[email protected]> Wed, 15 Jul 2026 15:53:48 -0400 (EDT)
Newsgroups gmane.emacs.diffs
Message-ID <[email protected]>
branch: master
commit ad0c340975856bafc0fcbd4914e5049b0d944479
Author: Paul Eggert <[email protected]>
Commit: Paul Eggert <[email protected]>

    Bump DUMP_RELOCATION_ALIGNMENT to alignof (Lisp_Object)
    
    * src/pdumper.c (DUMP_RELOCATION_ALIGNMENT): Now alignof
    (Lisp_Object) on all platforms.  This supports larger offsets on
    many platforms, and does not shrink the maximum supported offset
    on any known platform.  See Bug#44531.
---
 src/pdumper.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/pdumper.c b/src/pdumper.c
index 02f93a954e1..9a018fcd60f 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -271,17 +271,8 @@ enum
 
    /* 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.
-      The fix for bug#44531 was discovered late during Emacs 31 development,
-      so on Emacs 31 the value is 4 except on hosts where 4 is known to fail.
-      The only known failure is m68k a.out, so work around the problem
-      only if __mc68000__ is defined and the Lisp_Object alignment is 2,
-      which is a known property of the m68k a.out format.  */
-#ifdef __mc68000__
-   DUMP_RELOCATION_ALIGNMENT = min (4, alignof (Lisp_Object)),
-#else
-   DUMP_RELOCATION_ALIGNMENT = 4,
-#endif
+      larger values help dump_reloc_set_offset support larger offsets.  */
+   DUMP_RELOCATION_ALIGNMENT = alignof (Lisp_Object),
 
    /* The alignment granularity (in bytes) for objects we store in the
       dump.  Always suitable for heap objects; may be more aligned.  */