summaryrefslogtreecommitdiff
path: root/src/m
diff options
context:
space:
mode:
Diffstat (limited to 'src/m')
-rw-r--r--src/m/alpha.h18
-rw-r--r--src/m/ibmrs6000.h11
-rw-r--r--src/m/ibms390.h9
-rw-r--r--src/m/ibms390x.h20
-rw-r--r--src/m/intel386.h21
-rw-r--r--src/m/sparc.h25
-rw-r--r--src/m/vax.h12
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.
You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=osf1
-NOTE-END
-
-*/
-
#ifndef _LP64
-#define _LP64 /* This doesn't appear to be necessary
- on OSF 4/5 -- fx. */
+#define _LP64 /* This doesn't appear to be necessary on OSF 4/5 -- fx. */
#endif
/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
is the most significant byte. */
-
#undef WORDS_BIG_ENDIAN
/* Now define a symbol for the cpu type, if your compiler
@@ -52,15 +39,12 @@ NOTE-END
are always unsigned.
This flag only matters if you use USE_LISP_UNION_TYPE. */
-
#define 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)
/* 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 @@
/* R2 AIX machine/system dependent defines
- Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -18,13 +18,6 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="aix3-1" */
-
-/* Now define a symbol for the cpu type, if your compiler
- does not define it automatically. */
-
/* The data segment in this machine always starts at address 0x20000000.
An address of data cannot be stored correctly in a Lisp object;
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
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="<name of system .h file here, without the s- or .h>" */
-
/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
is the most significant byte. */
-
#define WORDS_BIG_ENDIAN
/* 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/>. */
are always unsigned.
This flag only matters if you use USE_LISP_UNION_TYPE. */
-
#define 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
@@ -49,7 +41,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Otherwise Emacs assumes that text space precedes data space,
numerically. */
-
#define VIRT_ADDR_VARIES
/* 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/>. */
into ibms390.h. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="<name of system .h file here, without the s- or .h>"
-
-NOTE-START
-IBM s390 64 bits (-machine=ibms390x64)
-
- The possibilities for -opsystem are: gnu-linux.
-
-NOTE-END */
-
+/* 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. */
@@ -49,15 +38,12 @@ NOTE-END */
are always unsigned.
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
@@ -66,23 +52,19 @@ NOTE-END */
Otherwise Emacs assumes that text space precedes data space,
numerically. */
-
#define VIRT_ADDR_VARIES
/* Define HAVE_ALLOCA to say that the system provides a properly
working alloca function and it should be used. Undefine it if an
assembler-language alloca in the file alloca.s should be used. */
-
#define HAVE_ALLOCA
/* On the 64 bit architecture, we can use 60 bits for addresses */
-
#define VALBITS 60
#define LINKER $(CC) -nostdlib
/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-
#define XPNTR(a) XUINT (a)
/* 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 @@
/* Machine description file for intel 386.
- Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -18,25 +18,8 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Intel 386 (-machine=intel386)
-
- The possibilities for -opsystem are: bsd4-2, usg5-2-2, usg5-3,
- isc2-2, 386-ix, and linux.
-
- 18.58 should support a wide variety of operating systems.
- Use linux for Linux.
- It isn't clear what to do on an SCO system.
-
-NOTE-END */
-
/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
is the most significant byte. */
-
#undef WORDS_BIG_ENDIAN
#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 @@
/* machine description file for Sun 4 SPARC.
- Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+ 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@@ -17,47 +17,34 @@ 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/>. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-Use -opsystem=sunos4 for operating system version 4, and
--opsystem=bsd4-2 for earlier versions.
-NOTE-END */
-
/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
is the most significant byte. */
-
#define WORDS_BIG_ENDIAN
/* __sparc__ is defined by the compiler by default. */
/* XINT must explicitly sign-extend
This flag only matters if you use USE_LISP_UNION_TYPE. */
-
#define 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)
/* Mask for address bits within a memory segment */
-
#define SEGMENT_MASK (SEGSIZ - 1)
#ifdef __arch64__ /* GCC, 64-bit ABI. */
+
#define BITS_PER_LONG 64
#ifndef _LP64
-#define _LP64 /* Done on Alpha -- not sure if it
- should be here. -- fx */
-#endif
+#define _LP64 /* Done on Alpha -- not sure if it should be here. -- fx */
#endif
+#endif /* __arch64__ */
+
/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
(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
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
-/* The following line tells the configuration script what sort of
- operating system this machine is likely to run.
- USUAL-OPSYS="note"
-
-NOTE-START
-The vax (-machine=vax) runs zillions of different operating systems.
-
-NOTE-END */
-
/* Define WORDS_BIG_ENDIAN if lowest-numbered byte in a word
is the most significant byte. */
-
#undef WORDS_BIG_ENDIAN
/* #define vax -- appears to be done automatically */
@@ -38,11 +28,9 @@ NOTE-END */
support the load average, so disable it for them. */
/* Data type of load average, as read out of kmem. */
-
#define LOAD_AVE_TYPE double
/* Convert that into an integer that is 100 for a load average of 1.0 */
-
#define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
#define HAVE_FTIME