pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k
authorJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Sat, 24 Sep 2022 18:37:18 +0000 (13:37 -0500)
committerSean Whitton <spwhitton@spwhitton.name>
Mon, 10 Oct 2022 00:17:14 +0000 (17:17 -0700)
Before the change builds would fail like this:

  (...)
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/vc/vc-hooks.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/vc/ediff-hook.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/uniquify.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/electric.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/emacs-lisp/eldoc.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/cus-start.el (source)...
  Loading /<<BUILDDIR>>/emacs-27.1+1/debian/build-src/lisp/tooltip.el (source)...
  Finding pointers to doc strings...
  Finding pointers to doc strings...done
  Dumping under the name bootstrap-emacs.pdmp
  dumping fingerprint: 7b5c59c589dc151eb1e4269bd83fbe809616b5cb9bb5c80014d5b560b391dfb6
  dump relocation out of range

[rlb@defaultvalue.org: create commit message]

Origin: debian
Bug: https://bugs.gnu.org/44531
Bug-Debian: http://bugs.debian.org/1019130
Forwarded: not-needed

src/pdumper.c

index b0167299d793d7f113ea40792dd6a150db0f978b..4cc268e485af41a79a5487f17c75e1fec8a0684c 100644 (file)
@@ -265,7 +265,11 @@ struct dump_table_locator
 enum
   {
    DUMP_RELOC_TYPE_BITS = 5,
+#ifdef __mc68000__
+   DUMP_RELOC_ALIGNMENT_BITS = 1,
+#else
    DUMP_RELOC_ALIGNMENT_BITS = 2,
+#endif
 
    /* Minimum alignment required by dump file format.  */
    DUMP_RELOCATION_ALIGNMENT = 1 << DUMP_RELOC_ALIGNMENT_BITS,