Mercurial > emacs
changeset 108955:57d9635c33fb
* src/m/ibms390x.h: Rather than duplicating ibms390.h, just include it.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 09 Jun 2010 22:23:00 -0700 |
parents | fee0bded7a66 |
children | 4f510fa72be2 cc3c27fdb5e5 |
files | src/ChangeLog src/m/ibms390x.h |
diffstat | 2 files changed, 6 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Jun 09 22:20:14 2010 -0700 +++ b/src/ChangeLog Wed Jun 09 22:23:00 2010 -0700 @@ -1,3 +1,7 @@ +2010-06-10 Glenn Morris <rgm@gnu.org> + + * m/ibms390x.h: Rather than duplicating ibms390.h, just include it. + 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string.
--- a/src/m/ibms390x.h Wed Jun 09 22:20:14 2010 -0700 +++ b/src/m/ibms390x.h Wed Jun 09 22:23:00 2010 -0700 @@ -1,4 +1,4 @@ -/* machine description file for IBM S390 in 64-bit mode +/* Machine description file for IBM S390 in 64-bit mode Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. @@ -18,17 +18,11 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ -/* This file was made by copying the significant parts of amdx86-64.h - into ibms390.h. */ +#include "ibms390.h" -/* Used for machine IBM s390 64 bits with opsys gnu-linux. */ #define BITS_PER_LONG 64 #define BITS_PER_EMACS_INT 64 -/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word - is the most significant byte. */ -#define WORDS_BIG_ENDIAN - /* Define the type to use. */ #define EMACS_INT long #define EMACS_UINT unsigned long @@ -40,20 +34,6 @@ This flag only matters if you use USE_LISP_UNION_TYPE. */ #undef EXPLICIT_SIGN_EXTEND -/* Data type of load average, as read out of kmem. */ -#define LOAD_AVE_TYPE long - -/* Convert that into an integer that is 100 for a load average of 1.0 */ -#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) - -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ -#define VIRT_ADDR_VARIES - /* On the 64 bit architecture, we can use 60 bits for addresses */ #define VALBITS 60