Merge from trunk.

1 files changed, 5 insertions, 0 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 18a248567a1..ea2fea77e29 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -4236,6 +4236,11 @@ mark_maybe_pointer (void *p)
 }
 
 
+/* Alignment of Lisp_Object and pointer values.  Use offsetof, as it
+   sometimes returns a smaller alignment than GCC's __alignof__ and
+   mark_memory might miss objects if __alignof__ were used.  For
+   example, on x86 with WIDE_EMACS_INT, __alignof__ (Lisp_Object) is 8
+   but GC_LISP_OBJECT_ALIGNMENT should be 4.  */
 #ifndef GC_LISP_OBJECT_ALIGNMENT
 # define GC_LISP_OBJECT_ALIGNMENT offsetof (struct {char a; Lisp_Object b;}, b)
 #endif