diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/m/alpha.h | 18 | ||||
| -rw-r--r-- | src/m/ibmrs6000.h | 11 | ||||
| -rw-r--r-- | src/m/ibms390.h | 9 | ||||
| -rw-r--r-- | src/m/ibms390x.h | 20 | ||||
| -rw-r--r-- | src/m/intel386.h | 21 | ||||
| -rw-r--r-- | src/m/sparc.h | 25 | ||||
| -rw-r--r-- | src/m/vax.h | 12 |
7 files changed, 12 insertions, 104 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h index ec0ed92e24a..8f71b37a219 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h | |||
| @@ -20,25 +20,12 @@ GNU General Public License for more details. | |||
| 20 | You should have received a copy of the GNU General Public License | 20 | You should have received a copy of the GNU General Public License |
| 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 21 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 22 | 22 | ||
| 23 | |||
| 24 | /* The following line tells the configuration script what sort of | ||
| 25 | operating system this machine is likely to run. | ||
| 26 | USUAL-OPSYS="note" | ||
| 27 | |||
| 28 | NOTE-START | ||
| 29 | Use -opsystem=osf1 | ||
| 30 | NOTE-END | ||
| 31 | |||
| 32 | */ | ||
| 33 | |||
| 34 | #ifndef _LP64 | 23 | #ifndef _LP64 |
| 35 | #define _LP64 /* This doesn't appear to be necessary | 24 | #define _LP64 /* This doesn't appear to be necessary on OSF 4/5 -- fx. */ |
| 36 | on OSF 4/5 -- fx. */ | ||
| 37 | #endif | 25 | #endif |
| 38 | 26 | ||
| 39 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 27 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 40 | is the most significant byte. */ | 28 | is the most significant byte. */ |
| 41 | |||
| 42 | #undef WORDS_BIG_ENDIAN | 29 | #undef WORDS_BIG_ENDIAN |
| 43 | 30 | ||
| 44 | /* Now define a symbol for the cpu type, if your compiler | 31 | /* Now define a symbol for the cpu type, if your compiler |
| @@ -52,15 +39,12 @@ NOTE-END | |||
| 52 | are always unsigned. | 39 | are always unsigned. |
| 53 | 40 | ||
| 54 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 41 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 55 | |||
| 56 | #define EXPLICIT_SIGN_EXTEND | 42 | #define EXPLICIT_SIGN_EXTEND |
| 57 | 43 | ||
| 58 | /* Data type of load average, as read out of kmem. */ | 44 | /* Data type of load average, as read out of kmem. */ |
| 59 | |||
| 60 | #define LOAD_AVE_TYPE long | 45 | #define LOAD_AVE_TYPE long |
| 61 | 46 | ||
| 62 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 47 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 63 | |||
| 64 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 48 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 65 | 49 | ||
| 66 | /* GNU malloc and the relocating allocator do not work together | 50 | /* GNU malloc and the relocating allocator do not work together |
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 8027afcc30e..cae666a43a0 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* R2 AIX machine/system dependent defines | 1 | /* R2 AIX machine/system dependent defines |
| 2 | Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | 2009, 2010 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -18,13 +18,6 @@ You should have received a copy of the GNU General Public License | |||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="aix3-1" */ | ||
| 24 | |||
| 25 | /* Now define a symbol for the cpu type, if your compiler | ||
| 26 | does not define it automatically. */ | ||
| 27 | |||
| 28 | /* The data segment in this machine always starts at address 0x20000000. | 21 | /* The data segment in this machine always starts at address 0x20000000. |
| 29 | An address of data cannot be stored correctly in a Lisp object; | 22 | An address of data cannot be stored correctly in a Lisp object; |
| 30 | we always lose the high bits. We must tell XPNTR to add them back. */ | 23 | we always lose the high bits. We must tell XPNTR to add them back. */ |
diff --git a/src/m/ibms390.h b/src/m/ibms390.h index efcd58daba3..9a8897e443d 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h | |||
| @@ -18,13 +18,8 @@ You should have received a copy of the GNU General Public License | |||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */ | ||
| 24 | |||
| 25 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 26 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 27 | |||
| 28 | #define WORDS_BIG_ENDIAN | 23 | #define WORDS_BIG_ENDIAN |
| 29 | 24 | ||
| 30 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend | 25 | /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend |
| @@ -32,15 +27,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 32 | are always unsigned. | 27 | are always unsigned. |
| 33 | 28 | ||
| 34 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 29 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 35 | |||
| 36 | #define EXPLICIT_SIGN_EXTEND | 30 | #define EXPLICIT_SIGN_EXTEND |
| 37 | 31 | ||
| 38 | /* Data type of load average, as read out of kmem. */ | 32 | /* Data type of load average, as read out of kmem. */ |
| 39 | |||
| 40 | #define LOAD_AVE_TYPE long | 33 | #define LOAD_AVE_TYPE long |
| 41 | 34 | ||
| 42 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 35 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 43 | |||
| 44 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 36 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 45 | 37 | ||
| 46 | /* Define VIRT_ADDR_VARIES if the virtual addresses of | 38 | /* Define VIRT_ADDR_VARIES if the virtual addresses of |
| @@ -49,7 +41,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 49 | 41 | ||
| 50 | Otherwise Emacs assumes that text space precedes data space, | 42 | Otherwise Emacs assumes that text space precedes data space, |
| 51 | numerically. */ | 43 | numerically. */ |
| 52 | |||
| 53 | #define VIRT_ADDR_VARIES | 44 | #define VIRT_ADDR_VARIES |
| 54 | 45 | ||
| 55 | /* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314 | 46 | /* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314 |
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 18cd87f0b9a..4d83dc6e69a 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h | |||
| @@ -21,23 +21,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 21 | into ibms390.h. */ | 21 | into ibms390.h. */ |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | /* The following line tells the configuration script what sort of | 24 | /* Used for machine IBM s390 64 bits with opsys gnu-linux. */ |
| 25 | operating system this machine is likely to run. | ||
| 26 | USUAL-OPSYS="<name of system .h file here, without the s- or .h>" | ||
| 27 | |||
| 28 | NOTE-START | ||
| 29 | IBM s390 64 bits (-machine=ibms390x64) | ||
| 30 | |||
| 31 | The possibilities for -opsystem are: gnu-linux. | ||
| 32 | |||
| 33 | NOTE-END */ | ||
| 34 | |||
| 35 | #define BITS_PER_LONG 64 | 25 | #define BITS_PER_LONG 64 |
| 36 | #define BITS_PER_EMACS_INT 64 | 26 | #define BITS_PER_EMACS_INT 64 |
| 37 | 27 | ||
| 38 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 28 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 39 | is the most significant byte. */ | 29 | is the most significant byte. */ |
| 40 | |||
| 41 | #define WORDS_BIG_ENDIAN | 30 | #define WORDS_BIG_ENDIAN |
| 42 | 31 | ||
| 43 | /* Define the type to use. */ | 32 | /* Define the type to use. */ |
| @@ -49,15 +38,12 @@ NOTE-END */ | |||
| 49 | are always unsigned. | 38 | are always unsigned. |
| 50 | 39 | ||
| 51 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 40 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 52 | |||
| 53 | #undef EXPLICIT_SIGN_EXTEND | 41 | #undef EXPLICIT_SIGN_EXTEND |
| 54 | 42 | ||
| 55 | /* Data type of load average, as read out of kmem. */ | 43 | /* Data type of load average, as read out of kmem. */ |
| 56 | |||
| 57 | #define LOAD_AVE_TYPE long | 44 | #define LOAD_AVE_TYPE long |
| 58 | 45 | ||
| 59 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 46 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 60 | |||
| 61 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 47 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 62 | 48 | ||
| 63 | /* Define VIRT_ADDR_VARIES if the virtual addresses of | 49 | /* Define VIRT_ADDR_VARIES if the virtual addresses of |
| @@ -66,23 +52,19 @@ NOTE-END */ | |||
| 66 | 52 | ||
| 67 | Otherwise Emacs assumes that text space precedes data space, | 53 | Otherwise Emacs assumes that text space precedes data space, |
| 68 | numerically. */ | 54 | numerically. */ |
| 69 | |||
| 70 | #define VIRT_ADDR_VARIES | 55 | #define VIRT_ADDR_VARIES |
| 71 | 56 | ||
| 72 | /* Define HAVE_ALLOCA to say that the system provides a properly | 57 | /* Define HAVE_ALLOCA to say that the system provides a properly |
| 73 | working alloca function and it should be used. Undefine it if an | 58 | working alloca function and it should be used. Undefine it if an |
| 74 | assembler-language alloca in the file alloca.s should be used. */ | 59 | assembler-language alloca in the file alloca.s should be used. */ |
| 75 | |||
| 76 | #define HAVE_ALLOCA | 60 | #define HAVE_ALLOCA |
| 77 | 61 | ||
| 78 | /* On the 64 bit architecture, we can use 60 bits for addresses */ | 62 | /* On the 64 bit architecture, we can use 60 bits for addresses */ |
| 79 | |||
| 80 | #define VALBITS 60 | 63 | #define VALBITS 60 |
| 81 | 64 | ||
| 82 | #define LINKER $(CC) -nostdlib | 65 | #define LINKER $(CC) -nostdlib |
| 83 | 66 | ||
| 84 | /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ | 67 | /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */ |
| 85 | |||
| 86 | #define XPNTR(a) XUINT (a) | 68 | #define XPNTR(a) XUINT (a) |
| 87 | 69 | ||
| 88 | /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 | 70 | /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519 |
diff --git a/src/m/intel386.h b/src/m/intel386.h index e2e22c3a538..3f9a49c4f46 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Machine description file for intel 386. | 1 | /* Machine description file for intel 386. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | 2009, 2010 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -18,25 +18,8 @@ You should have received a copy of the GNU General Public License | |||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="note" | ||
| 24 | |||
| 25 | NOTE-START | ||
| 26 | Intel 386 (-machine=intel386) | ||
| 27 | |||
| 28 | The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3, | ||
| 29 | isc2-2, 386-ix, and linux. | ||
| 30 | |||
| 31 | 18.58 should support a wide variety of operating systems. | ||
| 32 | Use linux for Linux. | ||
| 33 | It isn't clear what to do on an SCO system. | ||
| 34 | |||
| 35 | NOTE-END */ | ||
| 36 | |||
| 37 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 38 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 39 | |||
| 40 | #undef WORDS_BIG_ENDIAN | 23 | #undef WORDS_BIG_ENDIAN |
| 41 | 24 | ||
| 42 | #ifdef USG | 25 | #ifdef USG |
diff --git a/src/m/sparc.h b/src/m/sparc.h index 23d334406bb..b949b56de32 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* machine description file for Sun 4 SPARC. | 1 | /* machine description file for Sun 4 SPARC. |
| 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, |
| 3 | 2008, 2009, 2010 Free Software Foundation, Inc. | 3 | 2009, 2010 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||
| @@ -17,47 +17,34 @@ GNU General Public License for more details. | |||
| 17 | You should have received a copy of the GNU General Public License | 17 | You should have received a copy of the GNU General Public License |
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | /* The following line tells the configuration script what sort of | ||
| 21 | operating system this machine is likely to run. | ||
| 22 | USUAL-OPSYS="note" | ||
| 23 | |||
| 24 | NOTE-START | ||
| 25 | Use -opsystem=sunos4 for operating system version 4, and | ||
| 26 | -opsystem=bsd4-2 for earlier versions. | ||
| 27 | NOTE-END */ | ||
| 28 | |||
| 29 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 20 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 30 | is the most significant byte. */ | 21 | is the most significant byte. */ |
| 31 | |||
| 32 | #define WORDS_BIG_ENDIAN | 22 | #define WORDS_BIG_ENDIAN |
| 33 | 23 | ||
| 34 | /* __sparc__ is defined by the compiler by default. */ | 24 | /* __sparc__ is defined by the compiler by default. */ |
| 35 | 25 | ||
| 36 | /* XINT must explicitly sign-extend | 26 | /* XINT must explicitly sign-extend |
| 37 | This flag only matters if you use USE_LISP_UNION_TYPE. */ | 27 | This flag only matters if you use USE_LISP_UNION_TYPE. */ |
| 38 | |||
| 39 | #define EXPLICIT_SIGN_EXTEND | 28 | #define EXPLICIT_SIGN_EXTEND |
| 40 | 29 | ||
| 41 | /* Data type of load average, as read out of kmem. */ | 30 | /* Data type of load average, as read out of kmem. */ |
| 42 | |||
| 43 | #define LOAD_AVE_TYPE long | 31 | #define LOAD_AVE_TYPE long |
| 44 | 32 | ||
| 45 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 33 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 46 | |||
| 47 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) | 34 | #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE) |
| 48 | 35 | ||
| 49 | /* Mask for address bits within a memory segment */ | 36 | /* Mask for address bits within a memory segment */ |
| 50 | |||
| 51 | #define SEGMENT_MASK (SEGSIZ - 1) | 37 | #define SEGMENT_MASK (SEGSIZ - 1) |
| 52 | 38 | ||
| 53 | #ifdef __arch64__ /* GCC, 64-bit ABI. */ | 39 | #ifdef __arch64__ /* GCC, 64-bit ABI. */ |
| 40 | |||
| 54 | #define BITS_PER_LONG 64 | 41 | #define BITS_PER_LONG 64 |
| 55 | 42 | ||
| 56 | #ifndef _LP64 | 43 | #ifndef _LP64 |
| 57 | #define _LP64 /* Done on Alpha -- not sure if it | 44 | #define _LP64 /* Done on Alpha -- not sure if it should be here. -- fx */ |
| 58 | should be here. -- fx */ | ||
| 59 | #endif | ||
| 60 | #endif | 45 | #endif |
| 61 | 46 | ||
| 47 | #endif /* __arch64__ */ | ||
| 48 | |||
| 62 | /* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7 | 49 | /* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7 |
| 63 | (do not change this comment) */ | 50 | (do not change this comment) */ |
diff --git a/src/m/vax.h b/src/m/vax.h index f33c2d5227a..1670d2b5f48 100644 --- a/src/m/vax.h +++ b/src/m/vax.h | |||
| @@ -18,18 +18,8 @@ You should have received a copy of the GNU General Public License | |||
| 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 18 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 19 | 19 | ||
| 20 | 20 | ||
| 21 | /* The following line tells the configuration script what sort of | ||
| 22 | operating system this machine is likely to run. | ||
| 23 | USUAL-OPSYS="note" | ||
| 24 | |||
| 25 | NOTE-START | ||
| 26 | The vax (-machine=vax) runs zillions of different operating systems. | ||
| 27 | |||
| 28 | NOTE-END */ | ||
| 29 | |||
| 30 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word | 21 | /* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word |
| 31 | is the most significant byte. */ | 22 | is the most significant byte. */ |
| 32 | |||
| 33 | #undef WORDS_BIG_ENDIAN | 23 | #undef WORDS_BIG_ENDIAN |
| 34 | 24 | ||
| 35 | /* #define vax -- appears to be done automatically */ | 25 | /* #define vax -- appears to be done automatically */ |
| @@ -38,11 +28,9 @@ NOTE-END */ | |||
| 38 | support the load average, so disable it for them. */ | 28 | support the load average, so disable it for them. */ |
| 39 | 29 | ||
| 40 | /* Data type of load average, as read out of kmem. */ | 30 | /* Data type of load average, as read out of kmem. */ |
| 41 | |||
| 42 | #define LOAD_AVE_TYPE double | 31 | #define LOAD_AVE_TYPE double |
| 43 | 32 | ||
| 44 | /* Convert that into an integer that is 100 for a load average of 1.0 */ | 33 | /* Convert that into an integer that is 100 for a load average of 1.0 */ |
| 45 | |||
| 46 | #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) | 34 | #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0)) |
| 47 | 35 | ||
| 48 | #define HAVE_FTIME | 36 | #define HAVE_FTIME |