diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 18:19:30 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-07-21 18:19:30 +0000 |
| commit | b8ff87cc584b41ba7cc6b45a45c764e173b4cddf (patch) | |
| tree | 2f3f1deef035d8dee7d738879a72909c95019e85 /src | |
| parent | de08d1beb31907b85807b85a3c00b81c6893642d (diff) | |
| download | emacs-b8ff87cc584b41ba7cc6b45a45c764e173b4cddf.tar.gz | |
* 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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/m/iris4d.h | 14 | ||||
| -rw-r--r-- | src/m/mips.h | 21 | ||||
| -rw-r--r-- | src/sysdep.c | 2 |
4 files changed, 7 insertions, 36 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d222557645..c1a8f6a599f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/m/iris4d.h b/src/m/iris4d.h index ed055aa67df..923db142300 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -28,13 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #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 --git a/src/m/mips.h b/src/m/mips.h index ec26a86d988..d72cd8a8ccb 100644 --- a/src/m/mips.h +++ b/src/m/mips.h @@ -38,12 +38,6 @@ NOTE-END */ #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 @@ NOTE-END */ #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 --git a/src/sysdep.c b/src/sysdep.c index b19ed384754..b4dda533936 100644 --- a/src/sysdep.c +++ b/src/sysdep.c @@ -1360,7 +1360,7 @@ init_sys_modes (tty_out) 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 */ |