--- a/src/m/mips.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/m/mips.h	Mon Aug 13 11:20:41 2007 +0200
@@ -29,6 +29,16 @@
 Note that the proper m- file for the Decstation is m-pmax.h.
 NOTE-END  */
 
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+#undef WORD_MACHINE
+
+/* Define how to take a char and sign-extend into an int.
+   On machines where char is signed, this is a no-op.  */
+
+#define SIGN_EXTEND_CHAR(c) ((signed char)(c))
+
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -37,6 +47,14 @@
 #	define mips
 #endif
 
+/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
+   the bit field into an int.  In other words, if bit fields
+   are always unsigned.
+
+   If you use NO_UNION_TYPE, this flag does not matter.  */
+
+#define EXPLICIT_SIGN_EXTEND
+
 /* Data type of load average, as read out of kmem.  */
 
 #define LOAD_AVE_TYPE long
@@ -45,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
@@ -90,22 +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
-#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. */
@@ -128,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.  */
@@ -157,4 +167,4 @@
 #define TERMINFO
 #undef MAIL_USE_FLOCK  /* Someone should check this.  */
 #endif /* BSD */
-#endif /* !NEWSOS5 && !linux */
+#endif /* not NEWSOS5 */