4 files changed, 13 insertions, 18 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bb5d7e6d427..fd0c3e014c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2010-05-18  Glenn Morris  <rgm@gnu.org>
 
+        * Makefile.in (RALLOC_OBJ): New, set by configure.
+        (rallocobj): Replace with the previous variable.
+        (otherobj): Use $RALLOC_OBJ.
+
+        * s/gnu.h (REL_ALLOC) [DOUG_LEA_MALLOC]:
+        * s/gnu-linux.h (REL_ALLOC) [DOUG_LEA_MALLOC]: Move undef to configure.
+
         * Makefile.in (GMALLOC_OBJ, VMLIMIT_OBJ): New, set by configure.
         (gmallocobj, vmlimitobj): Replace with previous two variables.
         (otherobj): Use $GMALLOC_OBJ, $VMLIMIT_OBJ.
diff --git a/src/Makefile.in b/src/Makefile.in
index ff3726df6f8..6ed6e97b420 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -407,11 +407,8 @@ GMALLOC_OBJ=@GMALLOC_OBJ@
 /* vm-limit.o if !SYSTEM_MALLOC, else empty.  */
 VMLIMIT_OBJ=@VMLIMIT_OBJ@
 
-#if defined (REL_ALLOC) && ! defined (SYSTEM_MALLOC)
-rallocobj = ralloc.o
-#else
-rallocobj =
-#endif
+/* ralloc.o if !SYSTEM_MALLOC && REL_ALLOC, else empty.  */
+RALLOC_OBJ=@RALLOC_OBJ@
 
 /* Empty on Cygwin, lastfile.o elsewhere.  */
 PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
@@ -419,7 +416,7 @@ PRE_ALLOC_OBJ=@PRE_ALLOC_OBJ@
 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) $(rallocobj) \
+otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) $(RALLOC_OBJ) \
   $(POST_ALLOC_OBJ) $(WIDGET_OBJ) $(LIBOBJS)
 
 /* This is the platform-specific list of Lisp files loaded into the
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 3aa2dc16f42..c062f855276 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -147,11 +147,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NARROWPROTO 1
 
-/* Use mmap directly for allocating larger buffers.  */
-#ifdef DOUG_LEA_MALLOC
-#undef REL_ALLOC
-#endif
-
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 /* Not all the architectures are tested, but there are Debian packages
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 9f6fe52a5de..cb4c4a9d807 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,7 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-                 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+
+Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+  2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -28,11 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define SIGNALS_VIA_CHARACTERS
 
-/* Use mmap directly for allocating larger buffers.  */
-#ifdef DOUG_LEA_MALLOC
-#undef REL_ALLOC
-#endif
-
 /* GNU needs its own crt0, and libc defines data_start.  */
 #define ORDINARY_LINK
 #define DATA_START ({ extern int data_start; (char *) &data_start; })