diff options
| author | Glenn Morris | 2010-06-09 22:23:00 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-06-09 22:23:00 -0700 |
| commit | cb4bfcb5daa4faa12e7dd52b2c4fde2e20c90c09 (patch) | |
| tree | e47a394ff0d3da2301cc8fe55b18c19954c1ba76 | |
| parent | 50b79479fcd3a3cf0c0e3c0ca32695504ec76afc (diff) | |
| download | emacs-cb4bfcb5daa4faa12e7dd52b2c4fde2e20c90c09.tar.gz emacs-cb4bfcb5daa4faa12e7dd52b2c4fde2e20c90c09.zip | |
* src/m/ibms390x.h: Rather than duplicating ibms390.h, just include it.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/m/ibms390x.h | 24 |
2 files changed, 6 insertions, 22 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7e7b05f077a..8f43d0e8cb0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-06-10 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * m/ibms390x.h: Rather than duplicating ibms390.h, just include it. | ||
| 4 | |||
| 1 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-06-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. | 7 | * dbusbind.c (xd_append_arg): Don't "make-unibyte" the string. |
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 07284585597..6cbfbbcdbd4 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* machine description file for IBM S390 in 64-bit mode | 1 | /* Machine description file for IBM S390 in 64-bit mode |
| 2 | 2 | ||
| 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 3 | Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
| 4 | Free Software Foundation, Inc. | 4 | Free Software Foundation, Inc. |
| @@ -18,17 +18,11 @@ GNU General Public License for more details. | |||
| 18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | /* This file was made by copying the significant parts of amdx86-64.h | 21 | #include "ibms390.h" |
| 22 | into ibms390.h. */ | ||
| 23 | 22 | ||
| 24 | /* Used for machine IBM s390 64 bits with opsys gnu-linux. */ | ||
| 25 | #define BITS_PER_LONG 64 | 23 | #define BITS_PER_LONG 64 |
| 26 | #define BITS_PER_EMACS_INT 64 | 24 | #define BITS_PER_EMACS_INT 64 |
| 27 | 25 | ||
| 28 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | ||
| 29 | is the most significant byte. */ | ||
| 30 | #define WORDS_BIG_ENDIAN | ||
| 31 | |||
| 32 | /* Define the type to use. */ | 26 | /* Define the type to use. */ |
| 33 | #define EMACS_INT long | 27 | #define EMACS_INT long |
| 34 | #define EMACS_UINT unsigned long | 28 | #define EMACS_UINT unsigned long |
| @@ -40,20 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 40 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 34 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 41 | #undef EXPLICIT_SIGN_EXTEND | 35 | #undef EXPLICIT_SIGN_EXTEND |
| 42 | 36 | ||
| 43 | /* Data type of load average, as read out of kmem. */ | ||
| 44 | #define LOAD_AVE_TYPE long | ||
| 45 | |||
| 46 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | ||
| 47 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | ||
| 48 | |||
| 49 | /* Define VIRT_ADDR_VARIES if the virtual addresses of | ||
| 50 | pure and impure space as loaded can vary, and even their | ||
| 51 | relative order cannot be relied on. | ||
| 52 | |||
| 53 | Otherwise Emacs assumes that text space precedes data space, | ||
| 54 | numerically. */ | ||
| 55 | #define VIRT_ADDR_VARIES | ||
| 56 | |||
| 57 | /* On the 64 bit architecture, we can use 60 bits for addresses */ | 37 | /* On the 64 bit architecture, we can use 60 bits for addresses */ |
| 58 | #define VALBITS 60 | 38 | #define VALBITS 60 |
| 59 | 39 | ||