# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1216794881 0
# Node ID 70e18d24c4963258b039cb4edda85fd5e8b00cb9
# Parent  d89afa2b4c2fc778da662df43f5e9e5e5d4f0238
* 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.

diff -r d89afa2b4c2f -r 70e18d24c496 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/ChangeLog	Wed Jul 23 06:34:41 2008 +0000
@@ -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 -r d89afa2b4c2f -r 70e18d24c496 src/emacs.c
--- a/src/emacs.c	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/emacs.c	Wed Jul 23 06:34:41 2008 +0000
@@ -827,7 +827,7 @@
       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 -r d89afa2b4c2f -r 70e18d24c496 src/m/alpha.h
--- a/src/m/alpha.h	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/m/alpha.h	Wed Jul 23 06:34:41 2008 +0000
@@ -113,11 +113,6 @@
 
 #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 @@
 # define TEXT_END ({ extern int _etext; &_etext; })
 # ifndef __ELF__
 #  define COFF
-#  define DATA_END ({ extern int _EDATA; &_EDATA; })
 # endif /* notdef __ELF__ */
 #endif
 
diff -r d89afa2b4c2f -r 70e18d24c496 src/m/ibmrs6000.h
--- a/src/m/ibmrs6000.h	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/m/ibmrs6000.h	Wed Jul 23 06:34:41 2008 +0000
@@ -48,7 +48,6 @@
 #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 -r d89afa2b4c2f -r 70e18d24c496 src/m/intel386.h
--- a/src/m/intel386.h	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/m/intel386.h	Wed Jul 23 06:34:41 2008 +0000
@@ -95,7 +95,6 @@
 
 #ifdef WINDOWSNT
 #define VIRT_ADDR_VARIES
-#define DATA_END 	get_data_end ()
 #define DATA_START 	get_data_start ()
 #define NO_ARG_ARRAY
 #endif
diff -r d89afa2b4c2f -r 70e18d24c496 src/s/darwin.h
--- a/src/s/darwin.h	Wed Jul 23 06:26:32 2008 +0000
+++ b/src/s/darwin.h	Wed Jul 23 06:34:41 2008 +0000
@@ -159,9 +159,6 @@
 /* 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. */