14 files changed, 17 insertions, 129 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6cf5b28b2ac..993e21fdae4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,19 @@
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
+        * m/template.h:
+        * m/sparc.h:
+        * m/mips.h:
+        * m/m68k.h:
+        * m/iris4d.h:
+        * m/intel386.h:
+        * m/ibms390x.h:
+        * m/ibms390.h:
+        * m/ia64.h:
+        * m/hp800.h:
+        * m/arm.h:
+        * m/amdx86-64.h: Remove dead code and references to unused
+        and compiler defined symbols.
        * unexmips.c:
        * unexelf.c: Remove references to desupported systems.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 2d7ce3bd01f..20e09adc597 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -43,11 +43,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* #define WORD_MACHINE */
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically:
   Ones defined so far include vax, m68000, ns16000, pyramid,
diff --git a/src/m/arm.h b/src/m/arm.h
index c548f7eb168..d87d461d8f3 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -34,11 +34,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef NO_ARG_ARRAY
 #endif
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#undef WORD_MACHINE
 /* Define how to take a char and sign-extend into an int.
   On machines where char is signed, this is a no-op.  */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 1a1a6abc465..27c22f7b957 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -32,19 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#undef WORD_MACHINE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#       define hp9000s800
-#endif
 /* Use type int rather than a union, to represent Lisp_Object */
 /* This is desirable for most machines.  */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 1bdaf69c15e..ecd3a801760 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -31,11 +31,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
-   to be corrected before they can be used as byte counts.  */
-/* #define WORD_MACHINE */
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically:
   Ones defined so far include vax, m68000, ns16000, pyramid,
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index cffc6c0691e..15081b0cfae 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -32,18 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#define WORD_MACHINE
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#define s390
 /* Use type int rather than a union, to represent Lisp_Object */
 /* This is desirable for most machines.  */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 61e2a3836ea..a3afd23f599 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -45,11 +45,6 @@ NOTE-END */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#define WORD_MACHINE
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically:
   Ones defined so far include vax, m68000, ns16000, pyramid,
diff --git a/src/m/intel386.h b/src/m/intel386.h
index a42af80ec43..540760cd575 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -57,18 +57,6 @@ NOTE-END */
 /* #define NO_ARG_ARRAY */
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* #define WORD_MACHINE */
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#define INTEL386
 /* Use type int rather than a union, to represent Lisp_Object */
 #define NO_UNION_TYPE
@@ -96,17 +84,6 @@ NOTE-END */
   And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5.  */
 #define LIBS_MACHINE -lkvm -lelf
-#ifndef SOLARIS2_4
-/* J.W.hawtin@lut.ac.uk says Solaris 2.1 on the X86 has FSCALE defined in a
-   system header. */
-#else /* SOLARIS2_4 */
-#ifndef __GNUC__
-#if 0 /* wisner@gryphon.com says this screws up cpp */
-#define C_SWITCH_MACHINE -Xa
-#endif
-#endif /* not __GNUC__ */
-#endif /* SOLARIS2_4 */
 /* configure thinks solaris X86 has gethostname, but it does not work,
   so undefine it.  */
 #undef HAVE_GETHOSTNAME
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index bcff842fc35..89eee47d49b 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -28,11 +28,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#undef WORD_MACHINE
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically:
   Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -59,22 +54,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EXPLICIT_SIGN_EXTEND
-/* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary.  */
-#if 0
-/* Data type of load average, as read out of kmem.  */
-#define LOAD_AVE_TYPE long      /* This doesn't quite work on the 4D */
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
-/* s-iris3-6.h uses /vmunix */
-#undef KERNEL_FILE
-#define KERNEL_FILE "/unix"
-#endif
 /* Define CANNOT_DUMP on machines where unexec does not work.
   Then the function dump-emacs will not be defined
   and temacs will do (load "loadup") automatically unless told otherwise.  */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 0ef44f597f8..a62c8795180 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -32,11 +32,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* #define NO_ARG_ARRAY */
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* #define WORD_MACHINE */
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically.  */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 4adfcb50e7b..eb263526c2d 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -27,11 +27,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-/* #define WORD_MACHINE */
 /* Now define a symbol for the cpu type, if your compiler
   does not define it automatically:
   Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -89,18 +84,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
-#if 0  /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
-          even with identical GCC, as, ld.  Let's take it out until we
-          know what's really going on here.  */
-/* GCC 2.95 and newer on GNU/Linux PPC changed the load address to
-   0x10000000.  */
-#if defined __linux__
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-#define DATA_SEG_BITS  0x10000000
-#endif
-#endif
-#endif /* 0 */
 #ifdef _ARCH_PPC64
 #ifndef _LP64
 #define _LP64
diff --git a/src/m/mips.h b/src/m/mips.h
index 877e4e4c900..7b9d658639d 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -39,11 +39,6 @@ NOTE-END  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#undef WORD_MACHINE
 /* Define how to take a char and sign-extend into an int.
   On machines where char is signed, this is a no-op.  */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 7113b8b1fce..233bf96d7c7 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -36,11 +36,7 @@ NOTE-END  */
 #define NO_ARG_ARRAY
-/* Say this machine is a sparc.  Probably already defined.  */
+/* __sparc__ is defined by the compiler by default.  */
-#ifndef __sparc__
-#define __sparc__
-#endif
 /* Use type int rather than a union, to represent Lisp_Object */
diff --git a/src/m/template.h b/src/m/template.h
index 4a7a73db937..e447fba7b4b 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -32,15 +32,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define NO_ARG_ARRAY
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-#define WORD_MACHINE
 /* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
+   does not define it automatically.
-   Ones defined so far include vax, m68000, ns16000, pyramid,
+   Ones defined so far include m68k and many others */
-   orion, tahoe, APOLLO and many others */
 /* Use type int rather than a union, to represent Lisp_Object */
 /* This is desirable for most machines.  */

diff --git a/src/ChangeLog b/src/ChangeLog index 6cf5b28b2ac..993e21fdae4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog
@@ -1,5 +1,19 @@
1	2008-07-10 Dan Nicolaescu <dann@ics.uci.edu>	1	2008-07-10 Dan Nicolaescu <dann@ics.uci.edu>
2		2
		3	* m/template.h:
		4	* m/sparc.h:
		5	* m/mips.h:
		6	* m/m68k.h:
		7	* m/iris4d.h:
		8	* m/intel386.h:
		9	* m/ibms390x.h:
		10	* m/ibms390.h:
		11	* m/ia64.h:
		12	* m/hp800.h:
		13	* m/arm.h:
		14	* m/amdx86-64.h: Remove dead code and references to unused
		15	and compiler defined symbols.
		16
3	* unexmips.c:	17	* unexmips.c:
4	* unexelf.c: Remove references to desupported systems.	18	* unexelf.c: Remove references to desupported systems.
5		19


diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 2d7ce3bd01f..20e09adc597 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h
@@ -43,11 +43,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
43		43
44	#define NO_ARG_ARRAY	44	#define NO_ARG_ARRAY
45		45
46	/* Define WORD_MACHINE if addresses and such have
47	* to be corrected before they can be used as byte counts. */
48
49	/* #define WORD_MACHINE */
50
51	/* Now define a symbol for the cpu type, if your compiler	46	/* Now define a symbol for the cpu type, if your compiler
52	does not define it automatically:	47	does not define it automatically:
53	Ones defined so far include vax, m68000, ns16000, pyramid,	48	Ones defined so far include vax, m68000, ns16000, pyramid,


diff --git a/src/m/arm.h b/src/m/arm.h index c548f7eb168..d87d461d8f3 100644 --- a/src/m/arm.h +++ b/src/m/arm.h
@@ -34,11 +34,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
34	#undef NO_ARG_ARRAY	34	#undef NO_ARG_ARRAY
35	#endif	35	#endif
36		36
37	/* Define WORD_MACHINE if addresses and such have
38	* to be corrected before they can be used as byte counts. */
39
40	#undef WORD_MACHINE
41
42	/* Define how to take a char and sign-extend into an int.	37	/* Define how to take a char and sign-extend into an int.
43	On machines where char is signed, this is a no-op. */	38	On machines where char is signed, this is a no-op. */
44		39


diff --git a/src/m/hp800.h b/src/m/hp800.h index 1a1a6abc465..27c22f7b957 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h
@@ -32,19 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32		32
33	#define NO_ARG_ARRAY	33	#define NO_ARG_ARRAY
34		34
35	/* Define WORD_MACHINE if addresses and such have
36	* to be corrected before they can be used as byte counts. */
37
38	#undef WORD_MACHINE
39
40	/* Now define a symbol for the cpu type, if your compiler
41	does not define it automatically:
42	Ones defined so far include vax, m68000, ns16000, pyramid,
43	orion, tahoe, APOLLO and many others */
44	#ifndef hp9000s800
45	# define hp9000s800
46	#endif
47
48	/* Use type int rather than a union, to represent Lisp_Object */	35	/* Use type int rather than a union, to represent Lisp_Object */
49	/* This is desirable for most machines. */	36	/* This is desirable for most machines. */
50		37


diff --git a/src/m/ia64.h b/src/m/ia64.h index 1bdaf69c15e..ecd3a801760 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h
@@ -31,11 +31,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31		31
32	#define NO_ARG_ARRAY	32	#define NO_ARG_ARRAY
33		33
34	/* Define WORD_MACHINE if addresses and such have
35	to be corrected before they can be used as byte counts. */
36
37	/* #define WORD_MACHINE */
38
39	/* Now define a symbol for the cpu type, if your compiler	34	/* Now define a symbol for the cpu type, if your compiler
40	does not define it automatically:	35	does not define it automatically:
41	Ones defined so far include vax, m68000, ns16000, pyramid,	36	Ones defined so far include vax, m68000, ns16000, pyramid,


diff --git a/src/m/ibms390.h b/src/m/ibms390.h index cffc6c0691e..15081b0cfae 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h
@@ -32,18 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32		32
33	#define NO_ARG_ARRAY	33	#define NO_ARG_ARRAY
34		34
35	/* Define WORD_MACHINE if addresses and such have
36	* to be corrected before they can be used as byte counts. */
37
38	#define WORD_MACHINE
39
40	/* Now define a symbol for the cpu type, if your compiler
41	does not define it automatically:
42	Ones defined so far include vax, m68000, ns16000, pyramid,
43	orion, tahoe, APOLLO and many others */
44
45	#define s390
46
47	/* Use type int rather than a union, to represent Lisp_Object */	35	/* Use type int rather than a union, to represent Lisp_Object */
48	/* This is desirable for most machines. */	36	/* This is desirable for most machines. */
49		37


diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 61e2a3836ea..a3afd23f599 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h
@@ -45,11 +45,6 @@ NOTE-END */
45		45
46	#define NO_ARG_ARRAY	46	#define NO_ARG_ARRAY
47		47
48	/* Define WORD_MACHINE if addresses and such have
49	* to be corrected before they can be used as byte counts. */
50
51	#define WORD_MACHINE
52
53	/* Now define a symbol for the cpu type, if your compiler	48	/* Now define a symbol for the cpu type, if your compiler
54	does not define it automatically:	49	does not define it automatically:
55	Ones defined so far include vax, m68000, ns16000, pyramid,	50	Ones defined so far include vax, m68000, ns16000, pyramid,


diff --git a/src/m/intel386.h b/src/m/intel386.h index a42af80ec43..540760cd575 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h
@@ -57,18 +57,6 @@ NOTE-END */
57		57
58	/* #define NO_ARG_ARRAY */	58	/* #define NO_ARG_ARRAY */
59		59
60	/* Define WORD_MACHINE if addresses and such have
61	* to be corrected before they can be used as byte counts. */
62
63	/* #define WORD_MACHINE */
64
65	/* Now define a symbol for the cpu type, if your compiler
66	does not define it automatically:
67	Ones defined so far include vax, m68000, ns16000, pyramid,
68	orion, tahoe, APOLLO and many others */
69
70	#define INTEL386
71
72	/* Use type int rather than a union, to represent Lisp_Object */	60	/* Use type int rather than a union, to represent Lisp_Object */
73		61
74	#define NO_UNION_TYPE	62	#define NO_UNION_TYPE
@@ -96,17 +84,6 @@ NOTE-END */
96	And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5. */	84	And handa@etl.gov.jp says that -lkvm needs -llelf, at least on 2.5. */
97	#define LIBS_MACHINE -lkvm -lelf	85	#define LIBS_MACHINE -lkvm -lelf
98		86
99	#ifndef SOLARIS2_4
100	/* J.W.hawtin@lut.ac.uk says Solaris 2.1 on the X86 has FSCALE defined in a
101	system header. */
102	#else /* SOLARIS2_4 */
103	#ifndef __GNUC__
104	#if 0 /* wisner@gryphon.com says this screws up cpp */
105	#define C_SWITCH_MACHINE -Xa
106	#endif
107	#endif /* not __GNUC__ */
108	#endif /* SOLARIS2_4 */
109
110	/* configure thinks solaris X86 has gethostname, but it does not work,	87	/* configure thinks solaris X86 has gethostname, but it does not work,
111	so undefine it. */	88	so undefine it. */
112	#undef HAVE_GETHOSTNAME	89	#undef HAVE_GETHOSTNAME


diff --git a/src/m/iris4d.h b/src/m/iris4d.h index bcff842fc35..89eee47d49b 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h
@@ -28,11 +28,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
28		28
29	#define NO_ARG_ARRAY	29	#define NO_ARG_ARRAY
30		30
31	/* Define WORD_MACHINE if addresses and such have
32	* to be corrected before they can be used as byte counts. */
33
34	#undef WORD_MACHINE
35
36	/* Now define a symbol for the cpu type, if your compiler	31	/* Now define a symbol for the cpu type, if your compiler
37	does not define it automatically:	32	does not define it automatically:
38	Ones defined so far include vax, m68000, ns16000, pyramid,	33	Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -59,22 +54,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
59		54
60	#define EXPLICIT_SIGN_EXTEND	55	#define EXPLICIT_SIGN_EXTEND
61		56
62	/* jg@genmagic.genmagic.com (John Giannandrea) says this is unnecessary. */
63	#if 0
64	/* Data type of load average, as read out of kmem. */
65
66	#define LOAD_AVE_TYPE long /* This doesn't quite work on the 4D */
67
68	/* Convert that into an integer that is 100 for a load average of 1.0 */
69
70	#define LOAD_AVE_CVT(x) (int)(((double)(x)*100)/1024.0)
71
72	/* s-iris3-6.h uses /vmunix */
73
74	#undef KERNEL_FILE
75	#define KERNEL_FILE "/unix"
76	#endif
77
78	/* Define CANNOT_DUMP on machines where unexec does not work.	57	/* Define CANNOT_DUMP on machines where unexec does not work.
79	Then the function dump-emacs will not be defined	58	Then the function dump-emacs will not be defined
80	and temacs will do (load "loadup") automatically unless told otherwise. */	59	and temacs will do (load "loadup") automatically unless told otherwise. */


diff --git a/src/m/m68k.h b/src/m/m68k.h index 0ef44f597f8..a62c8795180 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h
@@ -32,11 +32,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32		32
33	/* #define NO_ARG_ARRAY */	33	/* #define NO_ARG_ARRAY */
34		34
35	/* Define WORD_MACHINE if addresses and such have
36	* to be corrected before they can be used as byte counts. */
37
38	/* #define WORD_MACHINE */
39
40	/* Now define a symbol for the cpu type, if your compiler	35	/* Now define a symbol for the cpu type, if your compiler
41	does not define it automatically. */	36	does not define it automatically. */
42		37


diff --git a/src/m/macppc.h b/src/m/macppc.h index 4adfcb50e7b..eb263526c2d 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h
@@ -27,11 +27,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27		27
28	#define NO_ARG_ARRAY	28	#define NO_ARG_ARRAY
29		29
30	/* Define WORD_MACHINE if addresses and such have
31	* to be corrected before they can be used as byte counts. */
32
33	/* #define WORD_MACHINE */
34
35	/* Now define a symbol for the cpu type, if your compiler	30	/* Now define a symbol for the cpu type, if your compiler
36	does not define it automatically:	31	does not define it automatically:
37	Ones defined so far include vax, m68000, ns16000, pyramid,	32	Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -89,18 +84,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
89	#endif	84	#endif
90	#endif	85	#endif
91		86
92	#if 0 /* This breaks things on PPC GNU/Linux ecept for Yellowdog,
93	even with identical GCC, as, ld. Let's take it out until we
94	know what's really going on here. */
95	/* GCC 2.95 and newer on GNU/Linux PPC changed the load address to
96	0x10000000. */
97	#if defined __linux__
98	#if __GNUC__ > 2 \|\| (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
99	#define DATA_SEG_BITS 0x10000000
100	#endif
101	#endif
102	#endif /* 0 */
103
104	#ifdef _ARCH_PPC64	87	#ifdef _ARCH_PPC64
105	#ifndef _LP64	88	#ifndef _LP64
106	#define _LP64	89	#define _LP64


diff --git a/src/m/mips.h b/src/m/mips.h index 877e4e4c900..7b9d658639d 100644 --- a/src/m/mips.h +++ b/src/m/mips.h
@@ -39,11 +39,6 @@ NOTE-END */
39		39
40	#define NO_ARG_ARRAY	40	#define NO_ARG_ARRAY
41		41
42	/* Define WORD_MACHINE if addresses and such have
43	* to be corrected before they can be used as byte counts. */
44
45	#undef WORD_MACHINE
46
47	/* Define how to take a char and sign-extend into an int.	42	/* Define how to take a char and sign-extend into an int.
48	On machines where char is signed, this is a no-op. */	43	On machines where char is signed, this is a no-op. */
49		44


diff --git a/src/m/sparc.h b/src/m/sparc.h index 7113b8b1fce..233bf96d7c7 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h
@@ -36,11 +36,7 @@ NOTE-END */
36		36
37	#define NO_ARG_ARRAY	37	#define NO_ARG_ARRAY
38		38
39	/* Say this machine is a sparc. Probably already defined. */	39	/* __sparc__ is defined by the compiler by default. */
40
41	#ifndef __sparc__
42	#define __sparc__
43	#endif
44		40
45	/* Use type int rather than a union, to represent Lisp_Object */	41	/* Use type int rather than a union, to represent Lisp_Object */
46		42


diff --git a/src/m/template.h b/src/m/template.h index 4a7a73db937..e447fba7b4b 100644 --- a/src/m/template.h +++ b/src/m/template.h
@@ -32,15 +32,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32		32
33	#define NO_ARG_ARRAY	33	#define NO_ARG_ARRAY
34		34
35	/* Define WORD_MACHINE if addresses and such have
36	* to be corrected before they can be used as byte counts. */
37
38	#define WORD_MACHINE
39
40	/* Now define a symbol for the cpu type, if your compiler	35	/* Now define a symbol for the cpu type, if your compiler
41	does not define it automatically:	36	does not define it automatically.
42	Ones defined so far include vax, m68000, ns16000, pyramid,	37	Ones defined so far include m68k and many others */
43	orion, tahoe, APOLLO and many others */
44		38
45	/* Use type int rather than a union, to represent Lisp_Object */	39	/* Use type int rather than a union, to represent Lisp_Object */
46	/* This is desirable for most machines. */	40	/* This is desirable for most machines. */