# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1274150968 25200
# Node ID 3ba0676c49c97c22d020e3c4bc2abbee2892a2e9
# Parent  e565448628b85c8ed1184e371a923405b00fa775
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).

diff -r e565448628b8 -r 3ba0676c49c9 ChangeLog
--- a/ChangeLog	Mon May 17 19:44:07 2010 -0700
+++ b/ChangeLog	Mon May 17 19:49:28 2010 -0700
@@ -1,5 +1,8 @@
 2010-05-18  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
diff -r e565448628b8 -r 3ba0676c49c9 configure.in
--- a/configure.in	Mon May 17 19:44:07 2010 -0700
+++ b/configure.in	Mon May 17 19:49:28 2010 -0700
@@ -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)
diff -r e565448628b8 -r 3ba0676c49c9 src/ChangeLog
--- a/src/ChangeLog	Mon May 17 19:44:07 2010 -0700
+++ b/src/ChangeLog	Mon May 17 19:49:28 2010 -0700
@@ -1,5 +1,8 @@
 2010-05-18  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
diff -r e565448628b8 -r 3ba0676c49c9 src/Makefile.in
--- a/src/Makefile.in	Mon May 17 19:44:07 2010 -0700
+++ b/src/Makefile.in	Mon May 17 19:49:28 2010 -0700
@@ -412,12 +412,12 @@
 
 /* Empty on Cygwin, lastfile.o elsewhere.  */
 PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
-/* lastfile.o vm-limit.o on Cygwin, $VMLIMIT_OBJ elsewhere.  */
+/* lastfile.o on Cygwin, empty elsewhere.  */
 POST_ALLOC_OBJ=@POST_ALLOC_OBJ@
 
 /* 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