(STACK_DIRECTION): Undef before defining.

[__GNUC__] (C_SWITCH_MACHINE): Remove -cckr.
Add -32, only if IRIX_FORCE_32_BITS.

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index e1a8b4728431b7c6f82240c738170d941fc057e5..b7b1a09d21437e71f0667ab57a679b94ead41b23 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,4 +1,4 @@
-/* machine description file for Iris-4D machines.  Use with s/irix[45]-*.h.
+/* machine description file for Iris-4D machines.  Use with s/irix*.h.
    Copyright (C) 1987 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -171,6 +171,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Define STACK_DIRECTION for alloca.c */
 
+#undef STACK_DIRECTION
 #define STACK_DIRECTION -1
 \f
 /* The standard definitions of these macros would work ok,
@@ -188,5 +189,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #ifndef __GNUC__
 /* Turn off some "helpful" error checks for type mismatches
    that we can't fix without breaking other machines.  */
-#define C_SWITCH_MACHINE -cckr
+#ifdef IRIX_FORCE_32_BITS
+#define C_SWITCH_MACHINE -32
 #endif
+
+#endif /* not __GNUC__ */