A memory alignment problem causing m68k failures has been fixed

This patch has been backported from upstream to fix m68k build
failures:

  Properly align global lispsym

  * lib-src/make-docfile.c (close_emacs_globals): Wrap struct
  Lisp_Symbols inside struct.
  * src/alloc.c (sweep_symbols): Update use of lispsym.
  * src/lisp.h (builtin_lisp_symbol): Likewise.

Origin: backport, commit: 7a4d9f6304cffa39642507609605bcbfa40d4675
Bug-Debian: http://bugs.debian.org/868868
Forwarded: not-needed

Gbp-Pq: Name 0009-A-memory-alignment-problem-causing-m68k-failures-has.patch

diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index 29061b76b2634755236e00753f83176d65005429..bd268553248b897e92971866394f356743ba65c0 100644 (file)
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -667,7 +667,9 @@ close_emacs_globals (ptrdiff_t num_symbols)
           "#ifndef DEFINE_SYMBOLS\n"
           "extern\n"
           "#endif\n"
-          "struct Lisp_Symbol alignas (GCALIGNMENT) lispsym[%td];\n"),
+          "struct {\n"
+          "  struct Lisp_Symbol alignas (GCALIGNMENT) s;\n"
+          "} lispsym[%td];\n"),
          num_symbols);
 }
 

diff --git a/src/alloc.c b/src/alloc.c
index 68bee7728c0b0af886d65c087cbd0d48f13f94f4..9a96a425071eaeb196b41543d0433f9bfa4c72e5 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6823,7 +6823,7 @@ sweep_symbols (void)
   symbol_free_list = NULL;
 
   for (int i = 0; i < ARRAYELTS (lispsym); i++)
-    lispsym[i].gcmarkbit = 0;
+    lispsym[i].s.gcmarkbit = 0;
 
   for (sblk = symbol_block; sblk; sblk = *sprev)
     {

diff --git a/src/lisp.h b/src/lisp.h
index 5aee80cea118987c965fb4979caae427e02a0140..08c40dc3795b77f192b9c01a64202ca191d39823 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1110,7 +1110,7 @@ make_lisp_symbol (struct Lisp_Symbol *sym)
 INLINE Lisp_Object
 builtin_lisp_symbol (int index)
 {
-  return make_lisp_symbol (lispsym + index);
+  return make_lisp_symbol (&lispsym[index].s);
 }
 
 #define XSETINT(a, b) ((a) = make_number (b))