diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | configure.in | 2 | ||||
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/m/iris4d.h | 26 | ||||
-rw-r--r-- | src/s/irix6-5.h | 7 |
5 files changed, 17 insertions, 27 deletions
@@ -1,3 +1,7 @@ +2011-07-07 Dan Nicolaescu <[email protected]> + + * configure.in: Remove reference to iris4d.h. + 2011-07-05 Jan Djärv <[email protected]> * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS. diff --git a/configure.in b/configure.in index 2c258174d4..25e19f43a9 100644 --- a/configure.in +++ b/configure.in @@ -536,7 +536,7 @@ case "${canonical}" in ## 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). diff --git a/src/ChangeLog b/src/ChangeLog index 11ba7e0070..36f34fc9f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-07-07 Dan Nicolaescu <[email protected]> + + * m/iris4d.h: Remove file, move contents ... + * s/irix6-5.h: ... here. + 2011-07-06 Paul Eggert <[email protected]> Remove unportable assumption about struct layout (Bug#8884). diff --git a/src/m/iris4d.h b/src/m/iris4d.h deleted file mode 100644 index 881f71f846..0000000000 --- a/src/m/iris4d.h +++ /dev/null @@ -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 - diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index d283571d8f..26eb7dcde7 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h @@ -96,3 +96,10 @@ char *_getpty(); /* 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 |