* s/darwin.h (DATA_END):

* m/intel386.h (DATA_END):
* m/ibmrs6000.h (DATA_END):
* m/alpha.h (DATA_END): Remove, unused.
(LINUX_SBRK_BUG): Remove, move condition to the only use ...
* emacs.c (main): ... here.

6 files changed, 8 insertions, 12 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 191fa4bfa07..ea6ce58ec94 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        * s/darwin.h (DATA_END):
+        * m/intel386.h (DATA_END):
+        * m/ibmrs6000.h (DATA_END):
+        * m/alpha.h (DATA_END): Remove, unused.
+        (LINUX_SBRK_BUG): Remove, move condition to the only use ...
+        * emacs.c (main): ... here.
+
         * config.in: Regenerate.
         * s/ms-w32.h (subprocesses): Define unconditionally.
         * s/template.h (subprocesses): Update comment.
diff --git a/src/emacs.c b/src/emacs.c
index 35b2fada91f..b84f137be8d 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -827,7 +827,7 @@ main (argc, argv
       heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static);
     }
 
-#ifdef LINUX_SBRK_BUG
+#if (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
   __sbrk (1);
 #endif
 
diff --git a/src/m/alpha.h b/src/m/alpha.h
index cd023dd1e20..729b0ddd33d 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -113,11 +113,6 @@ NOTE-END
 
 #endif /* __ELF__ */
 
-#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
-/* This controls a conditional in main.  */
-#define LINUX_SBRK_BUG
-#endif
-
 /* On the Alpha it's best to avoid including TERMIO since struct
    termio and struct termios are mutually incompatible.  */
 #define NO_TERMIO
@@ -126,7 +121,6 @@ NOTE-END
 # define TEXT_END ({ extern int _etext; &_etext; })
 # ifndef __ELF__
 #  define COFF
-#  define DATA_END ({ extern int _EDATA; &_EDATA; })
 # endif /* notdef __ELF__ */
 #endif
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 37e1af3d41b..90fd21b5cd1 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -48,7 +48,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TEXT_START 0x10000000
 #define TEXT_END 0
 #define DATA_START 0x20000000
-#define DATA_END 0
 #define WORDS_BIG_ENDIAN
 #define DATA_SEG_BITS 0x20000000
 #define C_SWITCH_MACHINE -D_BSD
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 27408fb0b49..42a3e43c3fb 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -95,7 +95,6 @@ NOTE-END */
 
 #ifdef WINDOWSNT
 #define VIRT_ADDR_VARIES
-#define DATA_END        get_data_end ()
 #define DATA_START      get_data_start ()
 #define NO_ARG_ARRAY
 #endif
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 548b2da84fd..2d298aeb743 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -159,9 +159,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This seems to be right for end_of_text, but it may not be used anyway.  */
 #define TEXT_END get_etext()
 
-/* This seems to be right for end_of_data, but it may not be used anyway.  */
-#define DATA_END get_edata()
-
 /* Definitions for how to compile & link.  */
 
 /* Link in the Carbon or AppKit lib. */