diff options
| author | Dan Nicolaescu <[email protected]> | 2010-03-20 01:11:59 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <[email protected]> | 2010-03-20 01:11:59 -0700 |
| commit | 22e8757456ea6608246d9c81a83f6c5119f2e1fb (patch) | |
| tree | 84aefe1ae178ef9b7d5b26549dc1f0cf0406a495 /src | |
| parent | 05a670e6d3593a9e68804447dee5596fb7ca5ed4 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/emacs.c | 5 | ||||
| -rw-r--r-- | src/m/alpha.h | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 8b652226c8..2eaefe41fa 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2010-03-20 Dan Nicolaescu <[email protected]> + 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) diff --git a/src/emacs.c b/src/emacs.c index dbaae9b040..60aa14e2b7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -790,11 +790,6 @@ main (int argc, char **argv) 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]); diff --git a/src/m/alpha.h b/src/m/alpha.h index 5abf8bba72..065a0dd7d7 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h @@ -116,11 +116,6 @@ 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 |