From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Sat, 24 Sep 2022 18:37:18 +0000 (-0500)
Subject: pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1cfafc3575de8243f62d99bdea4110572feade93;p=emacs.git

pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k

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
---

diff --git a/src/pdumper.c b/src/pdumper.c
index 1b5ead5fb4a..72853c134b2 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -264,7 +264,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,