[Emacs-diffs] /srv/bzr/emacs/trunk r107903: Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).

[Paul Eggert]

------------------------------------------------------------
revno: 107903
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-04-13 23:18:49 -0700
message:
  Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).
  
  * lisp.h (GC_MARK_STACK): Default to GC_MAKE_GCPROS_NOOPS.
  * s/cygwin.h, s/darwin.h, s/freebsd.h, s/gnu.h, s/irix6-5.h, s/msdos.h:
  * s/netbsd.h, s/sol2-6.h:
  Remove definition of GC_MARK_STACK, since the default now works.
  * s/aix4-2.h, s/hpux10-20.h, s/unixware.h:
  Define GC_MARK_STACK to GC_USE_GCPROS_AS_BEFORE, since that's
  no longer the default.
  * s/gnu-linux.h (GC_MARK_STACK): Adjust to change in default.
modified:
  src/ChangeLog
  src/lisp.h
  src/s/aix4-2.h
  src/s/cygwin.h
  src/s/darwin.h
  src/s/freebsd.h
  src/s/gnu-linux.h
  src/s/gnu.h
  src/s/hpux10-20.h
  src/s/irix6-5.h
  src/s/msdos.h
  src/s/netbsd.h
  src/s/sol2-6.h
  src/s/unixware.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-04-14 01:46:06 +0000
+++ b/src/ChangeLog     2012-04-14 06:18:49 +0000
@@ -1,3 +1,15 @@
+2012-04-14  Paul Eggert  <address@hidden>
+
+       Make GC_MAKE_GCPROS_NOOPS the default (Bug#9926).
+       * lisp.h (GC_MARK_STACK): Default to GC_MAKE_GCPROS_NOOPS.
+       * s/cygwin.h, s/darwin.h, s/freebsd.h, s/gnu.h, s/irix6-5.h, s/msdos.h:
+       * s/netbsd.h, s/sol2-6.h:
+       Remove definition of GC_MARK_STACK, since the default now works.
+       * s/aix4-2.h, s/hpux10-20.h, s/unixware.h:
+       Define GC_MARK_STACK to GC_USE_GCPROS_AS_BEFORE, since that's
+       no longer the default.
+       * s/gnu-linux.h (GC_MARK_STACK): Adjust to change in default.
+
 2012-04-14  Atsuo Ohki  <address@hidden>  (tiny change)
 
        * lread.c (lisp_file_lexically_bound_p):

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2012-04-08 21:14:30 +0000
+++ b/src/lisp.h        2012-04-14 06:18:49 +0000
@@ -2221,7 +2221,7 @@
 #define GC_USE_GCPROS_CHECK_ZOMBIES    3
 
 #ifndef GC_MARK_STACK
-#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
+#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 #endif
 
 /* Whether we do the stack marking manually.  */

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2012-01-19 07:21:25 +0000
+++ b/src/s/aix4-2.h    2012-04-14 06:18:49 +0000
@@ -75,3 +75,7 @@
    Emacs currently calls xrealloc on the results of get_current_dir name,
    to avoid a crash just use the Emacs implementation for that function.  */
 #define BROKEN_GET_CURRENT_DIR_NAME 1
+
+/* Conservative garbage collection has not been tested, so for now
+   play it safe and stick with the old-fashioned way of marking.  */
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE

=== modified file 'src/s/cygwin.h'
--- a/src/s/cygwin.h    2012-04-13 14:50:25 +0000
+++ b/src/s/cygwin.h    2012-04-14 06:18:49 +0000
@@ -82,12 +82,6 @@
 
 #define HAVE_SOCKETS
 
-/* This should work (at least when compiling with gcc).  But I have no way
-   or intention to verify or even test it.  If you encounter a problem with
-   it, feel free to change this setting, but please add a comment here about
-   why it needed to be changed.  */
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-
 /* Emacs supplies its own malloc, but glib (part of Gtk+) calls
    memalign and on Cygwin, that becomes the Cygwin-supplied memalign.
    As malloc is not the Cygwin malloc, the Cygwin memalign always

=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h    2012-01-19 07:21:25 +0000
+++ b/src/s/darwin.h    2012-04-14 06:18:49 +0000
@@ -145,6 +145,3 @@
    It is already a controlling terminal of subprocess, because we did
    ioctl TIOCSCTTY.  */
 #define DONT_REOPEN_PTY
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
-#define GC_MARK_STACK   GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/freebsd.h'
--- a/src/s/freebsd.h   2012-01-19 07:21:25 +0000
+++ b/src/s/freebsd.h   2012-04-14 06:18:49 +0000
@@ -58,6 +58,3 @@
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
-#define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-04-07 19:18:52 +0000
+++ b/src/s/gnu-linux.h 2012-04-14 06:18:49 +0000
@@ -145,7 +145,6 @@
     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
     || defined __ia64__ || defined __sh__
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 #ifdef __ia64__
 #define GC_MARK_SECONDARY_STACK()                              \
   do {                                                         \
@@ -155,4 +154,6 @@
                 __builtin_ia64_bsp ());                        \
   } while (0)
 #endif
+#else
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
 #endif

=== modified file 'src/s/gnu.h'
--- a/src/s/gnu.h       2012-01-28 03:11:41 +0000
+++ b/src/s/gnu.h       2012-04-14 06:18:49 +0000
@@ -45,6 +45,3 @@
 #endif /* emacs */
 
 #define POSIX_SIGNALS 1
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
-#define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2012-01-19 07:21:25 +0000
+++ b/src/s/hpux10-20.h 2012-04-14 06:18:49 +0000
@@ -100,6 +100,10 @@
    header sections which lose when `static' is defined away, as it is
    on HP-UX.  (You get duplicate symbol errors on linking). */
 #undef _FILE_OFFSET_BITS
+
+/* Conservative garbage collection has not been tested, so for now
+   play it safe and stick with the old-fashioned way of marking.  */
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
 
 /* The data segment on this machine always starts at address 0x40000000.  */
 #define DATA_SEG_BITS 0x40000000

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-01-19 07:21:25 +0000
+++ b/src/s/irix6-5.h   2012-04-14 06:18:49 +0000
@@ -95,7 +95,6 @@
 
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
 
 
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which

=== modified file 'src/s/msdos.h'
--- a/src/s/msdos.h     2012-01-19 07:21:25 +0000
+++ b/src/s/msdos.h     2012-04-14 06:18:49 +0000
@@ -137,4 +137,3 @@
 /* Tell the garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/netbsd.h'
--- a/src/s/netbsd.h    2012-01-19 07:21:25 +0000
+++ b/src/s/netbsd.h    2012-04-14 06:18:49 +0000
@@ -38,6 +38,3 @@
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
-#define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/sol2-6.h'
--- a/src/s/sol2-6.h    2012-01-05 09:46:05 +0000
+++ b/src/s/sol2-6.h    2012-04-14 06:18:49 +0000
@@ -59,4 +59,3 @@
   }
 
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS

=== modified file 'src/s/unixware.h'
--- a/src/s/unixware.h  2012-01-05 09:46:05 +0000
+++ b/src/s/unixware.h  2012-04-14 06:18:49 +0000
@@ -50,3 +50,7 @@
   }
 
 #define        PENDING_OUTPUT_COUNT(FILE) ((FILE)->__ptr - (FILE)->__base)
+
+/* Conservative garbage collection has not been tested, so for now
+   play it safe and stick with the old-fashioned way of marking.  */
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE