aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDan Nicolaescu2010-03-20 01:11:59 -0700
committerDan Nicolaescu2010-03-20 01:11:59 -0700
commit22e8757456ea6608246d9c81a83f6c5119f2e1fb (patch)
tree84aefe1ae178ef9b7d5b26549dc1f0cf0406a495 /src
parent05a670e6d3593a9e68804447dee5596fb7ca5ed4 (diff)
downloademacs-22e8757456ea6608246d9c81a83f6c5119f2e1fb.tar.gz
emacs-22e8757456ea6608246d9c81a83f6c5119f2e1fb.zip
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/ChangeLog4
-rw-r--r--src/emacs.c5
-rw-r--r--src/m/alpha.h5
3 files changed, 4 insertions, 10 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8b652226c84..2eaefe41fac 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12010-03-20 Dan Nicolaescu <dann@ics.uci.edu> 12010-03-20 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 Remove support for old GNU/Linux using libc version 5.
4 * m/alpha.h (LINUX_SBRK_BUG): Remove definition.
5 * emacs.c (main): Remove code depending on LINUX_SBRK_BUG.
6
3 Consolidate redundant definitions in s/bsd-common.h. 7 Consolidate redundant definitions in s/bsd-common.h.
4 * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO) 8 * s/bsd-common.h (BSD4_2, TABDLY, TAB3, HAVE_TERMIOS, NO_TERMIO)
5 (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS) 9 (LIBS_DEBUG, SYSV_SYSTEM_DIR, UNEXEC, NARROWPROTO, BSD_PGRPS)
diff --git a/src/emacs.c b/src/emacs.c
index dbaae9b040b..60aa14e2b78 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -790,11 +790,6 @@ main (int argc, char **argv)
790 heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static); 790 heap_bss_diff = (char *)my_heap_start - max (my_endbss, my_endbss_static);
791 } 791 }
792 792
793#ifdef LINUX_SBRK_BUG
794 /* This is only used GNU/LINUX running on alpha when using libc5 */
795 __sbrk (1);
796#endif
797
798#ifdef RUN_TIME_REMAP 793#ifdef RUN_TIME_REMAP
799 if (initialized) 794 if (initialized)
800 run_time_remap (argv[0]); 795 run_time_remap (argv[0]);
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 5abf8bba726..065a0dd7d71 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -116,11 +116,6 @@ NOTE-END
116 116
117#endif /* __ELF__ */ 117#endif /* __ELF__ */
118 118
119#if defined (GNU_LINUX) && __GNU_LIBRARY__ - 0 < 6
120/* This controls a conditional in main. */
121#define LINUX_SBRK_BUG
122#endif
123
124/* On the Alpha it's best to avoid including TERMIO since struct 119/* On the Alpha it's best to avoid including TERMIO since struct
125 termio and struct termios are mutually incompatible. */ 120 termio and struct termios are mutually incompatible. */
126#define NO_TERMIO 121#define NO_TERMIO