[Emacs-diffs] /srv/bzr/emacs/trunk r99704: Remove support for old GNU/Linux using libc version 5.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99704
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-03-20 01:11:59 -0700
message:
  Remove support for old GNU/Linux using libc version 5.
  * m/alpha.h (LINUX_SBRK_BUG): Remove definition.
  * emacs.c (main): Remove code depending on LINUX_SBRK_BUG.
modified:
  src/ChangeLog
  src/emacs.c
  src/m/alpha.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-20 07:57:11 +0000
+++ b/src/ChangeLog     2010-03-20 08:11:59 +0000
@@ -1,5 +1,9 @@
 2010-03-20  Dan Nicolaescu  <address@hidden>
 
+       Remove support for old GNU/Linux using libc version 5.
+       * m/alpha.h (LINUX_SBRK_BUG): Remove definition.
+       * emacs.c (main): Remove code depending on LINUX_SBRK_BUG.
+
        Consolidate redundant definitions in s/bsd-common.h.
        * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
        (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2010-03-20 00:46:01 +0000
+++ b/src/emacs.c       2010-03-20 08:11:59 +0000
@@ -790,11 +790,6 @@
       heap_bss_diff = (char *)my_heap_start - max (my_endbss, 
my_endbss_static);
     }
 
-#ifdef LINUX_SBRK_BUG
-  /* This is only used GNU/LINUX running on alpha when using libc5 */
-  __sbrk (1);
-#endif
-
 #ifdef RUN_TIME_REMAP
   if (initialized)
     run_time_remap (argv[0]);

=== modified file 'src/m/alpha.h'
--- a/src/m/alpha.h     2010-01-28 17:33:28 +0000
+++ b/src/m/alpha.h     2010-03-20 08:11:59 +0000
@@ -116,11 +116,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