# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1216664370 0
# Node ID feac6d588d821ecab1ba170d0fc9d460df556cab
# Parent  f09a4bda08dce0652d51aee704d2e545e16e309b
* m/mips.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Do not define, not used
on this platform.
(mips):
* m/iris4d.h (mips): Do not define.
* sysdep.c (init_sys_modes): Use __mips__ instead of mips.

diff -r f09a4bda08dc -r feac6d588d82 src/ChangeLog
--- a/src/ChangeLog	Mon Jul 21 18:15:28 2008 +0000
+++ b/src/ChangeLog	Mon Jul 21 18:19:30 2008 +0000
@@ -1,5 +1,11 @@
 2008-07-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* m/mips.h (LOAD_AVE_TYPE, LOAD_AVE_CVT): Do not define, not used
+	on this platform.
+	(mips):
+	* m/iris4d.h (mips): Do not define.
+	* sysdep.c (init_sys_modes): Use __mips__ instead of mips.
+
 	* m/ibmrs6000.h (LD_SWITCH_SITE): Remove.
 
 	* image.c:
diff -r f09a4bda08dc -r feac6d588d82 src/m/iris4d.h
--- a/src/m/iris4d.h	Mon Jul 21 18:15:28 2008 +0000
+++ b/src/m/iris4d.h	Mon Jul 21 18:19:30 2008 +0000
@@ -28,13 +28,6 @@
 
 #define NO_ARG_ARRAY
 
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-
-#ifndef mips
-#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.
@@ -43,13 +36,6 @@
 
 #define EXPLICIT_SIGN_EXTEND
 
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
 /* This machine requires completely different unexec code
    which lives in a separate file.  Specify the file name.  */
 
diff -r f09a4bda08dc -r feac6d588d82 src/m/mips.h
--- a/src/m/mips.h	Mon Jul 21 18:15:28 2008 +0000
+++ b/src/m/mips.h	Mon Jul 21 18:19:30 2008 +0000
@@ -38,12 +38,6 @@
 
 #define NO_ARG_ARRAY
 
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically.  */
-#ifndef mips
-#	define mips
-#endif
-
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
    the 24-bit bit field into an int.  In other words, if bit fields
    are always unsigned.
@@ -52,21 +46,6 @@
 
 #define EXPLICIT_SIGN_EXTEND
 
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / 256.0)
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
 /* Describe layout of the address space in an executing process.  */
 
 #define TEXT_START      0x00400000
diff -r f09a4bda08dc -r feac6d588d82 src/sysdep.c
--- a/src/sysdep.c	Mon Jul 21 18:15:28 2008 +0000
+++ b/src/sysdep.c	Mon Jul 21 18:19:30 2008 +0000
@@ -1360,7 +1360,7 @@
 					   of C-z */
 #endif /* VSWTCH */
   
-#if defined (mips) || defined (HAVE_TCATTR)
+#if defined (__mips__) || defined (HAVE_TCATTR)
 #ifdef VSUSP
   tty.main.c_cc[VSUSP] = CDISABLE;	/* Turn off mips handling of C-z.  */
 #endif /* VSUSP */