diff src/m/mips.h @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 182f72e8cd0d
children 74fd4e045ea6
line wrap: on
line diff
--- a/src/m/mips.h	Mon Aug 13 11:01:58 2007 +0200
+++ b/src/m/mips.h	Mon Aug 13 11:03:08 2007 +0200
@@ -63,12 +63,10 @@
 
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0)
 
-#ifndef linux
 /* CDC EP/IX 1.4.3 uses /unix */
 
 #undef KERNEL_FILE
 #define KERNEL_FILE "/unix"
-#endif /* ! linux */
 
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
@@ -108,23 +106,16 @@
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
 
-#ifndef linux
 #define UNEXEC "unexmips.o"
-#endif /* !linux */
+
 /* Describe layout of the address space in an executing process.  */
 
-#ifdef linux
-#define TEXT_START      0x00400000
-#define DATA_START      0x10000000
-#define DATA_SEG_BITS   0x10000000
-#else /* !linux */
 #define TEXT_START 0x400000
 #define DATA_START 0x800000
-#endif /* linux */
 
 /* Alter some of the options used when linking.  */
 
-#if !defined(NEWSOS5) && !defined(linux)
+#ifndef NEWSOS5
 #ifdef BSD
 
 /* DECstations don't have this library. */
@@ -147,9 +138,9 @@
 #define C_DEBUG_SWITCH "-O -g3"
 
 #endif /* not BSD */
-#endif /* !NEWSOS5 && !linux */
+#endif /* not NEWSOS5 */
 
-#if !defined(NEWSOS5) && !defined(linux)
+#ifndef NEWSOS5
 #ifdef USG
 
 /* Don't try to use SIGIO even though it is defined.  */
@@ -176,4 +167,4 @@
 #define TERMINFO
 #undef MAIL_USE_FLOCK  /* Someone should check this.  */
 #endif /* BSD */
-#endif /* !NEWSOS5 && !linux */
+#endif /* not NEWSOS5 */