Merge from emacs-24; up to 2012-04-25T15:23:19Z!sdl.web@gmail.com

[gnu-emacs] / src / s / gnu-linux.h

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index b54bd985e6bc3d9c20713e50b7c52efb0f12250c..409d0205520262da7ef4455b08731dad8f63de6a 100644 (file)
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -145,10 +145,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
     || defined __arm__ || defined __powerpc__ || defined __amd64__ \
     || defined __ia64__ || defined __sh__
 #define GC_SETJMP_WORKS 1
-#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
-#ifdef __mc68000__
-#define GC_LISP_OBJECT_ALIGNMENT 2
-#endif
 #ifdef __ia64__
 #define GC_MARK_SECONDARY_STACK()                              \
   do {                                                         \
@@ -158,4 +154,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
                 __builtin_ia64_bsp ());                        \
   } while (0)
 #endif
+#else
+#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
+#endif
+
+#ifdef __i386__
+/* libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared library, */
+/* we cannot get the maximum address for brk */
+# define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif