2 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index ad2da41b98c..66939d965d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-24  Dave Love  <fx@gnu.org>
+
+        * s/gnu-linux.h (GC_SETJMP_WORKS, GC_MARK_STACK): Define for more
+        architectures.
+
+        * alloc.c (mark_stack) [!GC_LISP_OBJECT_ALIGNMENT && __GNUC__]:
+        Use __alignof__.
+
 2003-01-24  Kenichi Handa  <handa@m17n.org>
 
         * keyboard.c (adjust_point_for_property): New second arg MODIFIED.
diff --git a/src/alloc.c b/src/alloc.c
index 10c4f6f235d..fb15f883175 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3774,6 +3774,9 @@ mark_stack ()
 
   /* This trick flushes the register windows so that all the state of
      the process is contained in the stack.  */
+  /* Fixme: Code in the Boehm GC sugests flushing (with `flushrs') is
+     needed on ia64 too.  See mach_dep.c, where it also says inline
+     assembler doesn't work with relevant proprietary compilers.  */
 #ifdef sparc
   asm ("ta 3");
 #endif
@@ -3804,8 +3807,12 @@ mark_stack ()
      that's not the case, something has to be done here to iterate
      over the stack segments.  */
 #ifndef GC_LISP_OBJECT_ALIGNMENT
+#ifdef __GNUC__
+#define GC_LISP_OBJECT_ALIGNMENT __alignof__ (Lisp_Object)
+#else
 #define GC_LISP_OBJECT_ALIGNMENT sizeof (Lisp_Object)
 #endif
+#endif
   for (i = 0; i < sizeof (Lisp_Object); i += GC_LISP_OBJECT_ALIGNMENT)
     mark_memory ((char *) stack_base + i, end);