2002-08-11 Andrew Choi <akochoi@shaw.ca>

[gnu-emacs] / src / m / iris4d.h

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 1af41405870a3d79aaf6c41a0d36e16ba0998307..457f3594636113416a3a6251788246793c18438f 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,5 +1,5 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -91,16 +91,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* #define VIRT_ADDR_VARIES */
 
-/* Define C_ALLOCA if this machine does not support a true alloca
-   and the one written in C should be used instead.
-   Define HAVE_ALLOCA to say that the system provides a properly
-   working alloca function and it should be used.
-   Define neither one if an assembler-language alloca
-   in the file alloca.s should be used.  */
-
-/* #define C_ALLOCA */  /* Sjoerd.Mullender@cwi.nl says no need.  */
-/* #define HAVE_ALLOCA */
-
 /* 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
@@ -168,12 +158,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
-
-/* Define STACK_DIRECTION for alloca.c */
-
-#undef STACK_DIRECTION
-#define STACK_DIRECTION -1
 \f
+#ifndef _LP64
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
 
@@ -182,9 +168,8 @@ Boston, MA 02111-1307, USA.  */
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
 
-#define XMARKBIT(a) ((a) < 0)
-#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
 #define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
+#endif /* _LP64 */
 
 #ifndef __GNUC__
 /* Turn off some "helpful" error checks for type mismatches
@@ -194,7 +179,7 @@ Boston, MA 02111-1307, USA.  */
 #ifndef IRIX6_5
 #define C_SWITCH_MACHINE -32
 #else
-#define C_SWITCH_MACHINE -n32 -G0
+#define C_SWITCH_MACHINE -n32
 #endif
 #endif
 #endif