[Emacs-diffs] /srv/bzr/emacs/trunk r109061: Move ULIMIT_BREAK_VALUE from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109061
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-07-12 20:19:10 -0400
message:
  Move ULIMIT_BREAK_VALUE from src/s to configure
  
  * configure.ac (ULIMIT_BREAK_VALUE): Move here from src/s.
  
  * src/s/gnu-linux.h, src/s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/gnu-linux.h
  src/s/irix6-5.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-13 00:00:23 +0000
+++ b/ChangeLog 2012-07-13 00:19:10 +0000
@@ -1,3 +1,7 @@
+2012-07-13  Glenn Morris  <address@hidden>
+
+       * configure.ac (ULIMIT_BREAK_VALUE): Move here from src/s.
+
 2012-07-12  Glenn Morris  <address@hidden>
 
        * configure.ac (AH_BOTTOM) [DARWIN_OS]: Move SYSTEM_PURESIZE_EXTRA

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-13 00:00:23 +0000
+++ b/configure.ac      2012-07-13 00:19:10 +0000
@@ -3545,6 +3545,7 @@
 esac
 
 
+AH_TEMPLATE(ULIMIT_BREAK_VALUE, [Undocumented.])
 AH_TEMPLATE(TAB3, [Undocumented.])
 
 case $opsys in
@@ -3555,10 +3556,25 @@
     AC_DEFINE(TAB3, OXTABS)
     ;;
 
+  gnu-linux | gnu-kfreebsd )
+    dnl libc-linux/sysdeps/linux/i386/ulimit.c says that due to shared
+    dnl library, we cannot get the maximum address for brk.
+    AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[
+#ifndef __i386__
+# error "not i386"
+#endif
+      ]], [[]])], AC_DEFINE(ULIMIT_BREAK_VALUE, [(32*1024*1024)]), [])
+    ;;
+
   hpux*)
     AC_DEFINE(RUN_TIME_REMAP, 1, [Define if emacs.c needs to call
       run_time_remap; for HPUX.])
     ;;
+
+  irix6-5)
+    dnl Ulimit(UL_GMEMLIM) is busted...
+    AC_DEFINE(ULIMIT_BREAK_VALUE, [0x14000000])
+    ;;
 esac
 
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-13 00:07:29 +0000
+++ b/src/ChangeLog     2012-07-13 00:19:10 +0000
@@ -1,5 +1,7 @@
 2012-07-13  Glenn Morris  <address@hidden>
 
+       * s/gnu-linux.h, s/irix6-5.h: Let configure set ULIMIT_BREAK_VALUE.
+
        * process.c (init_process_emacs): Replace MIN_PTY_KERNEL_VERSION.
        * s/darwin.h (MIN_PTY_KERNEL_VERSION): Remove single-use macro.
 

=== modified file 'src/s/gnu-linux.h'
--- a/src/s/gnu-linux.h 2012-07-12 20:53:41 +0000
+++ b/src/s/gnu-linux.h 2012-07-13 00:19:10 +0000
@@ -57,9 +57,3 @@
 #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

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-07-12 07:43:05 +0000
+++ b/src/s/irix6-5.h   2012-07-13 00:19:10 +0000
@@ -30,9 +30,6 @@
 char *_getpty();
 #endif
 
-/* Ulimit(UL_GMEMLIM) is busted...  */
-#define ULIMIT_BREAK_VALUE 0x14000000
-
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
 
 #undef TIOCSIGSEND             /* defined in usg5-4-common.h */