* m/alpha.h (LINUX_SBRK_BUG):

* emacs.c (main): Undo previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6640bca3ab34ff7795bc6b2d4ae1d4a1f0cb5443..005540b4a7946c8c2111cc832d95cf147edb4c2b 100644 (file)
--- 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 88ec48773167603d6982b43ff97c0b74d60ed4ff..96ae4001c391edf7ed482df008a99a6a2980418c 100644 (file)
--- 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 729b0ddd33dfb966fdcb3571a4af5eca2d19dfdf..6484241b9283898cdbb21302d142fcff9d5a4518 100644 (file)
--- 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