(TEXT_START, DATA_START, DATA_SEG_BITS, UNEXEC, DATA_END):

Omit these definitions if ELF.
(LINUX_SBRK_BUG): Omit this if using a recent GNU library.

1 files changed, 12 insertions, 6 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 606b7aab469..f3ee56f3a73 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -139,6 +139,8 @@ NOTE-END
 /* #define NO_SOCK_SIGIO */
 
 
+#ifndef __ELF__
+
 /* Describe layout of the address space in an executing process.  */
 
 #define TEXT_START    0x120000000
@@ -149,6 +151,12 @@ 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
 
@@ -175,15 +183,11 @@ NOTE-END
 #define START_FILES pre-crt0.o
 #endif
 
-#ifdef LINUX
+#if defined(LINUX) && __GNU_LIBRARY__ - 0 < 6
 /* 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
 
@@ -280,5 +284,7 @@ extern void r_alloc_free ();
 #define NO_TERMIO
 
 #define TEXT_END ({ extern int _etext; &_etext; })
-#define DATA_END ({ extern int _EDATA; &_EDATA; })
+#ifndef __ELF__
+# define DATA_END ({ extern int _EDATA; &_EDATA; })
+#endif /* notdef __ELF__ */
 #endif