[Emacs-diffs] /srv/bzr/emacs/trunk r109033: Trivial re-ordering and comment updating

[Glenn Morris]

------------------------------------------------------------
revno: 109033
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 14:39:44 -0400
message:
  Trivial re-ordering and comment updating
modified:
  src/s/gnu-linux.h

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-11 17:04:19 +0000
+++ b/src/s/gnu-linux.h 2012-07-11 18:39:44 +0000
@@ -87,29 +87,28 @@
 
 #define NARROWPROTO 1
 
+#ifdef __ia64__
+#define GC_MARK_SECONDARY_STACK()                              \
+  do {                                                         \
+    extern void *__libc_ia64_register_backing_store_base;      \
+    __builtin_ia64_flushrs ();                                 \
+    mark_memory (__libc_ia64_register_backing_store_base,      \
+                __builtin_ia64_bsp ());                        \
+  } while (0)
+#endif
+
 /* Tell that garbage collector that setjmp is known to save all
-   registers relevant for conservative garbage collection in the jmp_buf.  */
-/* Not all the architectures are tested, but there are Debian packages
+   registers relevant for conservative garbage collection in the jmp_buf.
+   Not all the architectures are tested, but there are Debian packages
    for SCM and/or Guile on them, so the technique must work.  See also
    comments in alloc.c concerning setjmp and gcc.  Fixme:  it's
-   probably safe to make this conditional just on GCC, except for ia64
-   register window-flushing.  */
-/* Don't use #cpu here since in newest development versions of GCC,
-   we must call cpp with -traditional, and that disables #cpu.  */
+   probably safe to just let the GCC conditional in AH_BOTTOM handle this.
+*/
 #if defined __i386__ || defined __sparc__ || defined __mc68000__ \
     || defined __alpha__ || defined __mips__ || defined __s390__ \
     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
     || defined __ia64__ || defined __sh__
 #define GC_SETJMP_WORKS 1
-#ifdef __ia64__
-#define GC_MARK_SECONDARY_STACK()                              \
-  do {                                                         \
-    extern void *__libc_ia64_register_backing_store_base;      \
-    __builtin_ia64_flushrs ();                                 \
-    mark_memory (__libc_ia64_register_backing_store_base,      \
-                __builtin_ia64_bsp ());                        \
-  } while (0)
-#endif
 #else
 #define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
 #endif