procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify Irix build, remove iris4d.h file.

Browse source 
* configure.in: Remove reference to iris4d.h.

* src/m/iris4d.h: Remove file, move contents ...
* src/s/irix6-5.h: ... here.
This commit is contained in:
Dan Nicolaescu 2011-07-06 20:24:33 -07:00
parent 9970bcb27c
commit 76b397fb2a
5 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2011-07-07 Dan Nicolaescu <dann@ics.uci.edu>
* configure.in: Remove reference to iris4d.h.
2011-07-05 Jan Djärv <jan.h.d@swipnet.se>
* configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.

2
configure.in
View file

@ -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).

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-07 Dan Nicolaescu <dann@ics.uci.edu>
* m/iris4d.h: Remove file, move contents ...
* s/irix6-5.h: ... here.
2011-07-06 Paul Eggert <eggert@cs.ucla.edu>
Remove unportable assumption about struct layout (Bug#8884).

26
src/m/iris4d.h
View file

@ -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

7
src/s/irix6-5.h
View file

@ -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