diff src/m/iris4d.h @ 88155:d7ddb3e565de

sync with trunk

--- a/src/m/iris4d.h	Sun Jan 15 23:02:10 2006 +0000
+++ b/src/m/iris4d.h	Mon Jan 16 00:03:54 2006 +0000
@@ -1,5 +1,5 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,8 +15,8 @@
 
 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, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
@@ -159,7 +159,10 @@
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
 
-#ifndef _LP64
+#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.  */
 
@@ -167,8 +170,6 @@
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
 #endif /* _LP64 */
 
 #ifndef __GNUC__
@@ -185,3 +186,6 @@
 #endif
 
 #endif /* not __GNUC__ */
+
+/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
+   (do not change this comment) */