From 598acd7135f99a44898ff5461cd7c04f3f4881b7 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 24 Sep 2022 13:37:18 -0500 Subject: [PATCH] pdumper: set DUMP_RELOC_ALIGNMENT_BITS=1 for m68k Before the change builds would fail like this: (...) Loading /<>/emacs-27.1+1/debian/build-src/lisp/vc/vc-hooks.el (source)... Loading /<>/emacs-27.1+1/debian/build-src/lisp/vc/ediff-hook.el (source)... Loading /<>/emacs-27.1+1/debian/build-src/lisp/uniquify.el (source)... Loading /<>/emacs-27.1+1/debian/build-src/lisp/electric.el (source)... Loading /<>/emacs-27.1+1/debian/build-src/lisp/emacs-lisp/eldoc.el (source)... Loading /<>/emacs-27.1+1/debian/build-src/lisp/cus-start.el (source)... Loading /<>/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 | 4 ++++ 1 file changed, 4 insertions(+) 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, -- 2.30.2