From cc61af6796973319943af95e6bbc64912ca18682 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Wed, 23 Jul 2008 23:37:18 +0000 Subject: [PATCH] * m/alpha.h (LINUX_SBRK_BUG): * emacs.c (main): Undo previous change. --- src/ChangeLog | 2 -- src/emacs.c | 3 ++- src/m/alpha.h | 5 +++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6640bca3ab3..005540b4a79 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -26,8 +26,6 @@ * 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. diff --git a/src/emacs.c b/src/emacs.c index 88ec4877316..96ae4001c39 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -827,7 +827,8 @@ main (argc, argv heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static); } -#if defined(GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6 +#ifdef LINUX_SBRK_BUG + /* This is only used GNU/LINUX running on alpha when using libc5 */ __sbrk (1); #endif diff --git a/src/m/alpha.h b/src/m/alpha.h index 729b0ddd33d..6484241b928 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -113,6 +113,11 @@ 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