Commit 6665f4c5 authored by Glenn Morris's avatar Glenn Morris

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).
parent 40dc6bf4
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.
......
......@@ -3226,11 +3226,11 @@ if test "$opsys" = "cygwin"; then
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)
......
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.
......
......@@ -412,12 +412,12 @@ RALLOC_OBJ=@RALLOC_OBJ@
/* 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment