Undo previous change.

[gnu-emacs] / src / m / alpha.h

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 7b07f6cd9b7173f263c6d9309b5b7913db3867d8..606b7aab4699cd9647a8b887e88672777cae461f 100644 (file)
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -139,21 +139,6 @@ NOTE-END
 /* #define NO_SOCK_SIGIO */
 
 
-#ifdef __ELF__
-/* With ELF, make sure that all common symbols get allocated to in the
-   data section.  Otherwise, the dump of temacs may miss variables in
-   the shared library that have been initialized.  For example, with
-   GNU libc, __malloc_initialized would normally be resolved to the
-   shared library's .bss section, which is fatal.  */
-# ifdef __GNUC__
-#  define C_SWITCH_MACHINE     -fno-common
-# else
-#  error What gives?  Fix me if DEC Unix supports ELF now.
-# endif
-#endif
-
-#ifndef __ELF__
-
 /* Describe layout of the address space in an executing process.  */
 
 #define TEXT_START    0x120000000
@@ -164,12 +149,6 @@ NOTE-END
 
 #define DATA_SEG_BITS 0x140000000
 
-/* The program to be used for unexec. */
-
-#define UNEXEC unexalpha.o
-
-#endif /* ! __ELF__ */
-
 #ifdef OSF1
 #define ORDINARY_LINK
 
@@ -196,11 +175,15 @@ NOTE-END
 #define START_FILES pre-crt0.o
 #endif
 
-#if defined(LINUX) && __GNU_LIBRARY__ - 0 < 6
+#ifdef LINUX
 /* This controls a conditional in main.  */
 #define LINUX_SBRK_BUG
 #endif
 
+/* The program to be used for unexec. */
+
+#define UNEXEC unexalpha.o
+
 
 #define PNTR_COMPARISON_TYPE unsigned long
 
@@ -290,14 +273,12 @@ extern void r_alloc_free ();
   while (0)
 #endif
 
-/* On the Alpha it's best to avoid including TERMIO since struct
-   termio and struct termios are mutually incompatible.  */
+#ifdef linux
+#define COFF
+/* Linux/Alpha doesn't like it if termio.h and termios.h get included
+   simultaneously.  */
 #define NO_TERMIO
 
-#ifdef LINUX
-# define TEXT_END ({ extern int _etext; &_etext; })
-# ifndef __ELF__
-#  define COFF
-#  define DATA_END ({ extern int _EDATA; &_EDATA; })
-# endif /* ! __ELF__ */
+#define TEXT_END ({ extern int _etext; &_etext; })
+#define DATA_END ({ extern int _EDATA; &_EDATA; })
 #endif