(remove-overlays): Fix last change.

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

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 5996d0e59337c20262b5cb66212b992fa95e0277..bc8d124271088c512a176905c470e0e9cb221f2e 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,5 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,18 +16,10 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
-/* The following three symbols give information on
- the size of various data types.  */
-
-#define SHORTBITS 16           /* Number of bits in a short */
-
-#define INTBITS 32             /* Number of bits in an int */
-
-#define LONGBITS 32            /* Number of bits in a long */
-
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
    is the most significant byte.  */
 
@@ -99,16 +92,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, 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
@@ -121,7 +104,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #ifdef USG5_4
 #undef UNEXEC
-#define UNEXEC unexelfsgi.o
+#define UNEXEC unexelf.o
 #else
 #define UNEXEC unexmips.o
 #endif
@@ -139,7 +122,15 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef LIBS_MACHINE
 /* -lsun in case using Yellow Pages for passwords.  */
+#if defined(__GNUC__) && defined(_ABIN32)
+#define LIBS_MACHINE
+#else
+#ifndef IRIX6_5
 #define LIBS_MACHINE -lmld
+#else
+#define LIBS_MACHINE
+#endif
+#endif
 #define LIBS_DEBUG
 
 /* Define this if you have a fairly recent system,
@@ -168,29 +159,34 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
-
-/* Define STACK_DIRECTION for alloca.c */
-
-#undef STACK_DIRECTION
-#define STACK_DIRECTION -1
 \f
+#if _MIPS_SZLONG != 64
+/* fixme: should there be 64-bit defiitions?  (The ones below aren't
+   OK.)  */
+
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
 
-#define XUINT(a) (((unsigned)(a) << INTBITS-VALBITS) >> INTBITS-VALBITS)
+#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
 
 #define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << INTBITS-VALBITS) >> INTBITS-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-#define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
-#define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS))
+   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
+#endif /* _LP64 */
 
 #ifndef __GNUC__
 /* Turn off some "helpful" error checks for type mismatches
    that we can't fix without breaking other machines.  */
 #ifdef IRIX_FORCE_32_BITS
+#ifdef THIS_IS_MAKEFILE
+#ifndef IRIX6_5
 #define C_SWITCH_MACHINE -32
+#else
+#define C_SWITCH_MACHINE -n32
+#endif
+#endif
 #endif
 
 #endif /* not __GNUC__ */
+
+/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
+   (do not change this comment) */