[Emacs-diffs] /srv/bzr/emacs/trunk r100337: Since Cygwin does not set SYSTEM_MALLOC, $(VMLIMIT_OBJ) == vm-limit.o.

[Glenn Morris]

------------------------------------------------------------
revno: 100337
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-05-17 19:49:28 -0700
message:
  Since Cygwin does not set SYSTEM_MALLOC, $(VMLIMIT_OBJ) == vm-limit.o.
  
  * configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o.
  (POST_ALLOC_OBJ) [!cygwin]: Set to empty.
  
  * src/Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from
  $(POST_ALLOC_OBJ).
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/Makefile.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2010-05-18 02:44:07 +0000
+++ b/ChangeLog 2010-05-18 02:49:28 +0000
@@ -1,5 +1,8 @@
 2010-05-18  Glenn Morris  <address@hidden>
 
+       * configure.in (POST_ALLOC_OBJ) [cygwin]: Omit vm-limit.o.
+       (POST_ALLOC_OBJ) [!cygwin]: Set to empty.
+
        * config.bat (RALLOC_OBJ): Edit to empty if sys_malloc.
        * configure.in (REL_ALLOC): Unset on gnu, gnu-linux if DOUG_LEA_MALLOC.
        (RALLOC_OBJ): New output variable.

=== modified file 'configure.in'
--- a/configure.in      2010-05-18 02:44:07 +0000
+++ b/configure.in      2010-05-18 02:49:28 +0000
@@ -3226,11 +3226,11 @@
   CYGWIN_OBJ="sheap.o"
   ## Cygwin differs because of its unexec().
   PRE_ALLOC_OBJ=
-  POST_ALLOC_OBJ="lastfile.o vm-limit.o"
+  POST_ALLOC_OBJ=lastfile.o
 else
   CYGWIN_OBJ=
   PRE_ALLOC_OBJ=lastfile.o
-  POST_ALLOC_OBJ="\$(VMLIMIT_OBJ)"
+  POST_ALLOC_OBJ=
 fi
 AC_SUBST(CYGWIN_OBJ)
 AC_SUBST(PRE_ALLOC_OBJ)

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-05-18 02:44:07 +0000
+++ b/src/ChangeLog     2010-05-18 02:49:28 +0000
@@ -1,5 +1,8 @@
 2010-05-18  Glenn Morris  <address@hidden>
 
+       * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) seperately from
+       $(POST_ALLOC_OBJ).
+
        * Makefile.in (RALLOC_OBJ): New, set by configure.
        (rallocobj): Replace with the previous variable.
        (otherobj): Use $RALLOC_OBJ.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-05-18 02:44:07 +0000
+++ b/src/Makefile.in   2010-05-18 02:49:28 +0000
@@ -412,12 +412,12 @@
 
 /* Empty on Cygwin, lastfile.o elsewhere.  */
 address@hidden@
-/* lastfile.o vm-limit.o on Cygwin, $VMLIMIT_OBJ elsewhere.  */
+/* lastfile.o on Cygwin, empty elsewhere.  */
 address@hidden@
 
 /* List of object files that make-docfile should not be told about.  */
 otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
-  $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
+  $(POST_ALLOC_OBJ) $(VMLIMIT_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 /* This is the platform-specific list of Lisp files loaded into the
    dumped Emacs.  It is arranged like this because it is easier to generate