[Emacs-diffs] /srv/bzr/emacs/trunk r105006: Simplify Irix build, remove iris4d.h file.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 105006
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 20:24:33 -0700
message:
  Simplify Irix build, remove iris4d.h file.
  
  * configure.in: Remove reference to iris4d.h.
  
  * src/m/iris4d.h: Remove file, move contents ...
  * src/s/irix6-5.h: ... here.
removed:
  src/m/iris4d.h
modified:
  ChangeLog
  configure.in
  src/ChangeLog
  src/s/irix6-5.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-07-05 08:21:38 +0000
+++ b/ChangeLog 2011-07-07 03:24:33 +0000
@@ -1,3 +1,7 @@
+2011-07-07  Dan Nicolaescu  <address@hidden>
+
+       * configure.in: Remove reference to iris4d.h.
+
 2011-07-05  Jan Djärv  <address@hidden>
 
        * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

=== modified file 'configure.in'
--- a/configure.in      2011-07-05 08:21:38 +0000
+++ b/configure.in      2011-07-07 03:24:33 +0000
@@ -536,7 +536,7 @@
   ## Silicon Graphics machines
   ## Iris 4D
   mips-sgi-irix6.5 )
-    machine=iris4d opsys=irix6-5
+    opsys=irix6-5
     # Without defining _LANGUAGE_C, things get masked out in the headers
     # so that, for instance, grepping for `free' in stdlib.h fails and
     # AC_HEADER_STD_C fails.   (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m).

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-06 22:22:32 +0000
+++ b/src/ChangeLog     2011-07-07 03:24:33 +0000
@@ -1,3 +1,8 @@
+2011-07-07  Dan Nicolaescu  <address@hidden>
+
+       * m/iris4d.h: Remove file, move contents ...
+       * s/irix6-5.h: ... here.
+
 2011-07-06  Paul Eggert  <address@hidden>
 
        Remove unportable assumption about struct layout (Bug#8884).

=== removed file 'src/m/iris4d.h'
--- a/src/m/iris4d.h    2011-01-25 04:08:28 +0000
+++ b/src/m/iris4d.h    1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-/* machine description file for Iris-4D machines.  Use with s/irix*.h.
-
-Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-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 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
-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.  If not, see <http://www.gnu.org/licenses/>.  */
-
-
-/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
-   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
-   the value field of a LISP_OBJECT).  */
-#define DATA_START 0x10000000
-#define DATA_SEG_BITS  0x10000000
-

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2011-03-17 02:36:27 +0000
+++ b/src/s/irix6-5.h   2011-07-07 03:24:33 +0000
@@ -96,3 +96,10 @@
 /* Tested on Irix 6.5.  SCM worked on earlier versions.  */
 #define GC_SETJMP_WORKS 1
 #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
+
+
+/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
+   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
+   the value field of a LISP_OBJECT).  */
+#define DATA_START 0x10000000
+#define DATA_SEG_BITS  0x10000000