From: Dan Nicolaescu Date: Thu, 10 Jul 2008 02:49:28 +0000 (+0000) Subject: * m/template.h: X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/ad76189a75b1be41dbc2cd2f9fb793cd2b403f57 * 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. --- diff --git a/src/ChangeLog b/src/ChangeLog index 6cf5b28b2a..993e21fdae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,19 @@ 2008-07-10 Dan Nicolaescu + * 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 2d7ce3bd01..20e09adc59 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h @@ -43,11 +43,6 @@ along with GNU Emacs. If not, see . */ #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 c548f7eb16..d87d461d8f 100644 --- a/src/m/arm.h +++ b/src/m/arm.h @@ -34,11 +34,6 @@ along with GNU Emacs. If not, see . */ #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 1a1a6abc46..27c22f7b95 100644 --- a/src/m/hp800.h +++ b/src/m/hp800.h @@ -32,19 +32,6 @@ along with GNU Emacs. If not, see . */ #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 1bdaf69c15..ecd3a80176 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h @@ -31,11 +31,6 @@ along with GNU Emacs. If not, see . */ #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 cffc6c0691..15081b0cfa 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h @@ -32,18 +32,6 @@ along with GNU Emacs. If not, see . */ #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 61e2a3836e..a3afd23f59 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 a42af80ec4..540760cd57 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 bcff842fc3..89eee47d49 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h @@ -28,11 +28,6 @@ along with GNU Emacs. If not, see . */ #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 . */ #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 0ef44f597f..a62c879518 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h @@ -32,11 +32,6 @@ along with GNU Emacs. If not, see . */ /* #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 4adfcb50e7..eb263526c2 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h @@ -27,11 +27,6 @@ along with GNU Emacs. If not, see . */ #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 . */ #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 877e4e4c90..7b9d658639 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 7113b8b1fc..233bf96d7c 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. */ - -#ifndef __sparc__ -#define __sparc__ -#endif +/* __sparc__ is defined by the compiler by default. */ /* Use type int rather than a union, to represent Lisp_Object */ diff --git a/src/m/template.h b/src/m/template.h index 4a7a73db93..e447fba7b4 100644 --- a/src/m/template.h +++ b/src/m/template.h @@ -32,15 +32,9 @@ along with GNU Emacs. If not, see . */ #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 */ + does not define it automatically. + Ones defined so far include m68k and many others */ /* Use type int rather than a union, to represent Lisp_Object */ /* This is desirable for most machines. */