* m/template.h:

[bpt/emacs.git] / src / m / iris4d.h

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 4304871..89eee47 100644 (file)
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,13 +1,13 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007  Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +15,10 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
    is the most significant byte.  */
 
 #define WORDS_BIG_ENDIAN
@@ -30,11 +28,6 @@ Boston, MA 02110-1301, USA.  */
 
 #define NO_ARG_ARRAY
 
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -61,22 +54,6 @@ Boston, MA 02110-1301, USA.  */
 
 #define EXPLICIT_SIGN_EXTEND
 
-/* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary.  */
-#if 0
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long     /* This doesn't quite work on the 4D */
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-
-/* s-iris3-6.h uses /vmunix */
-
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-#endif
-
 /* Define CANNOT_DUMP on machines where unexec does not work.
    Then the function dump-emacs will not be defined
    and temacs will do (load "loadup") automatically unless told otherwise.  */
@@ -121,16 +98,7 @@ Boston, MA 02110-1301, USA.  */
 #define DATA_SEG_BITS  0x10000000
 
 #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,
@@ -173,20 +141,5 @@ Boston, MA 02110-1301, USA.  */
    ((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) */