Mercurial > emacs
changeset 96924:70e18d24c496
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 23 Jul 2008 06:34:41 +0000 |
| parents | d89afa2b4c2f |
| children | c3d63bafd463 |
| files | src/ChangeLog src/emacs.c src/m/alpha.h src/m/ibmrs6000.h src/m/intel386.h src/s/darwin.h |
| diffstat | 6 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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
--- 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
--- 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
--- 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
--- 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. */