merge from upstream. currently seems to have bitroted and i get segfaults

author: Joakim Verona 2011-02-05 11:23:09 +0100
committer: Joakim Verona 2011-02-05 11:23:09 +0100
commit: 4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch)
tree: 894801e7308ce4ecc34933f959e28f4b9cff9533 /src/m
parent: 13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff)
parent: 9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff)
download: emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz
emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip
18 files changed, 14 insertions, 203 deletions
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3b6d7da92df..9ae089bfc5b 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,7 +1,6 @@
 /* Machine description file for the alpha chip.
-Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+Copyright (C) 1994, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 Author: Rainer Schoepf
 (according to authors.el)
@@ -30,13 +29,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* __alpha defined automatically */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   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
@@ -66,5 +58,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   this avoids the assembler bug.  */
 #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
-/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
-   (do not change this comment) */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 30aa2678717..2ae5d07390f 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,7 +1,6 @@
 /* machine description file for AMD x86-64.
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -31,13 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_INT               long
 #define EMACS_UINT              unsigned long
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   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
@@ -47,5 +39,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #undef DATA_SEG_BITS
-/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
-   (do not change this comment) */
diff --git a/src/m/arm.h b/src/m/arm.h
deleted file mode 100644
index 8b659bb5bd0..00000000000
--- a/src/m/arm.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Machine description file for ARM-based non-RISCiX machines.
-Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.  */
-/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
-   (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
deleted file mode 100644
index 9998f701a6b..00000000000
--- a/src/m/hp800.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* machine description file for hp9000 series 800 machines.
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.  */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-   This flag only matters if you use USE_LISP_UNION_TYPE.  */
-#define EXPLICIT_SIGN_EXTEND
-/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
-   (do not change this comment) */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index bbf09ac878b..48ba3005cd6 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,9 +1,8 @@
 /* machine description file for the IA-64 architecture.
-Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 2000-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
-Contributed by David Mosberger <davidm@hpl.hp.com>
+     Contributed by David Mosberger <davidm@hpl.hp.com>
 This file is part of GNU Emacs.
@@ -31,13 +30,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_INT               long
 #define EMACS_UINT              unsigned long
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   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
@@ -54,5 +46,3 @@ extern void r_alloc_free ();
 #endif /* not _MALLOC_INTERNAL */
 #endif /* REL_ALLOC */
-/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
-   (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 785719e908b..ca2188bc068 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,7 +1,6 @@
 /* R2 AIX machine/system dependent defines
-Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1988, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -45,5 +44,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define BROKEN_SIGPTY
 #define BROKEN_SIGPOLL
-/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
-   (do not change this comment) */
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 0acc826a1ea..f2aef1ba513 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -1,7 +1,6 @@
 /* Machine description file for IBM S390 in 32-bit mode
-Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
-  2008, 2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -19,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/>.  */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   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
@@ -40,5 +32,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   numerically.  */
 #define VIRT_ADDR_VARIES
-/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
-   (do not change this comment) */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 6cbfbbcdbd4..d4ef5c291ef 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,7 +1,6 @@
 /* Machine description file for IBM S390 in 64-bit mode
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
-  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -27,18 +26,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_INT long
 #define EMACS_UINT unsigned long
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   are always unsigned.
-   This flag only matters if you use USE_LISP_UNION_TYPE.  */
-#undef EXPLICIT_SIGN_EXTEND
 /* On the 64 bit architecture, we can use 60 bits for addresses */
 #define VALBITS         60
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #define XPNTR(a) XUINT (a)
-/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
-   (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 15601fae76e..16f0645715c 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,7 +1,6 @@
 /* Machine description file for intel 386.
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -30,5 +29,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
-/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
-   (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 31f08d05cfc..881f71f846f 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,7 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -19,18 +18,9 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-   This flag only matters if you use USE_LISP_UNION_TYPE.  */
-#define EXPLICIT_SIGN_EXTEND
 /* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
   were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
   the value field of a LISP_OBJECT).  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS   0x10000000
-/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
-   (do not change this comment) */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 8d53424ccec..16e0b9f0bef 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,7 +1,6 @@
 /* Machine description file for generic Motorola 68k.
-Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+Copyright (C) 1985, 1995, 2001-2011  Free Software Foundation, Inc.
-  2008, 2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -24,13 +23,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define m68k
 #endif
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   are always unsigned.
-   This flag only matters if you use USE_LISP_UNION_TYPE.  */
-#define EXPLICIT_SIGN_EXTEND
 #ifdef GNU_LINUX
 #ifdef __ELF__
 #define DATA_SEG_BITS 0x80000000
@@ -38,5 +30,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
-/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
-   (do not change this comment) */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 01735790b20..5d78e39bdba 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,7 +1,6 @@
 /* machine description file For the powerpc Macintosh.
-Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1994, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -30,5 +29,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 #endif
-/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
-   (do not change this comment) */
diff --git a/src/m/mips.h b/src/m/mips.h
deleted file mode 100644
index b3a754c2b61..00000000000
--- a/src/m/mips.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* m- file for Mips machines.
-Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
-This file is part of GNU Emacs.
-GNU Emacs is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.  */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   are always unsigned.
-   This flag only matters if you use USE_LISP_UNION_TYPE.  */
-#define EXPLICIT_SIGN_EXTEND
-/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
-   (do not change this comment) */
diff --git a/src/m/sh3.h b/src/m/sh3.h
deleted file mode 100644
index ebfdb5b2d64..00000000000
--- a/src/m/sh3.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Machine description file for SuperH. */
-/* arch-tag: 1b01b84f-f044-4afa-aa4b-caa54ec38966
-   (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 26ca3caaebe..50e56f0f3dc 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,7 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
-  2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -20,10 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* __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
@@ -40,5 +35,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif  /* __arch64__ */
-/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
-   (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index 4efc9158a45..f06f62b6cda 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,7 +1,6 @@
 /* machine description file template.
-Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
-  2008, 2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -22,13 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   does not define it automatically.
   Ones defined so far include m68k and many others */
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
-   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
@@ -55,5 +47,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   you should also check `etc/MACHINES' to make sure its descriptions
   of known problems in that configuration should be updated.  */
-/* arch-tag: d7dae0a9-4f99-4939-bef9-5738e1f33955
-   (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index 16e790a2769..2fecf17ca84 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,7 +1,6 @@
 /* machine description file for vax.
-Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
-  2008, 2009, 2010  Free Software Foundation, Inc.
 This file is part of GNU Emacs.
@@ -32,5 +31,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define HAVE_FTIME
-/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
-   (do not change this comment) */
diff --git a/src/m/xtensa.h b/src/m/xtensa.h
deleted file mode 100644
index 8e1da54b25b..00000000000
--- a/src/m/xtensa.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Machine description file for Tensilica Xtensa.
-Add a license notice if this grows to > 10 lines of code.  */
-/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a
-   (do not change this comment) */
author	Joakim Verona	2011-02-05 11:23:09 +0100
committer	Joakim Verona	2011-02-05 11:23:09 +0100
commit	4bd51ad5c3445b644dfb017d5b57b10a90aa325f (patch)
tree	894801e7308ce4ecc34933f959e28f4b9cff9533 /src/m
parent	13cfe8df462ab8da9f0028e16cc84dcaceaca3d1 (diff)
parent	9bcaafce5351d270ac514e23cb69ff1a5fd35229 (diff)
download	emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.tar.gz emacs-4bd51ad5c3445b644dfb017d5b57b10a90aa325f.zip

diff --git a/src/m/alpha.h b/src/m/alpha.h index 3b6d7da92df..9ae089bfc5b 100644 --- a/src/m/alpha.h +++ b/src/m/alpha.h
@@ -1,7 +1,6 @@
1	/* Machine description file for the alpha chip.	1	/* Machine description file for the alpha chip.
2		2
3	Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006,	3	Copyright (C) 1994, 1997, 1999, 2001-2011 Free Software Foundation, Inc.
4	2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5		4
6	Author: Rainer Schoepf	5	Author: Rainer Schoepf
7	(according to authors.el)	6	(according to authors.el)
@@ -30,13 +29,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30	/* __alpha defined automatically */	29	/* __alpha defined automatically */
31		30
32		31
33	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
34	the 24-bit bit field into an int. In other words, if bit fields
35	are always unsigned.
36
37	This flag only matters if you use USE_LISP_UNION_TYPE. */
38	#define EXPLICIT_SIGN_EXTEND
39
40	/* Data type of load average, as read out of kmem. */	32	/* Data type of load average, as read out of kmem. */
41	#define LOAD_AVE_TYPE long	33	#define LOAD_AVE_TYPE long
42		34
@@ -66,5 +58,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
66	this avoids the assembler bug. */	58	this avoids the assembler bug. */
67	#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308	59	#define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
68		60
69	/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
70	(do not change this comment) */


diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h index 30aa2678717..2ae5d07390f 100644 --- a/src/m/amdx86-64.h +++ b/src/m/amdx86-64.h
@@ -1,7 +1,6 @@
1	/* machine description file for AMD x86-64.	1	/* machine description file for AMD x86-64.
2		2
3	Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010	3	Copyright (C) 2002-2011 Free Software Foundation, Inc.
4	Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -31,13 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31	#define EMACS_INT long	30	#define EMACS_INT long
32	#define EMACS_UINT unsigned long	31	#define EMACS_UINT unsigned long
33		32
34	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
35	the 24-bit bit field into an int. In other words, if bit fields
36	are always unsigned.
37
38	This flag only matters if you use USE_LISP_UNION_TYPE. */
39	#define EXPLICIT_SIGN_EXTEND
40
41	/* Data type of load average, as read out of kmem. */	33	/* Data type of load average, as read out of kmem. */
42	#define LOAD_AVE_TYPE long	34	#define LOAD_AVE_TYPE long
43		35
@@ -47,5 +39,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
47	/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */	39	/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
48	#undef DATA_SEG_BITS	40	#undef DATA_SEG_BITS
49		41
50	/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
51	(do not change this comment) */


diff --git a/src/m/arm.h b/src/m/arm.h deleted file mode 100644 index 8b659bb5bd0..00000000000 --- a/src/m/arm.h +++ /dev/null
@@ -1,22 +0,0 @@
1	/* Machine description file for ARM-based non-RISCiX machines.
2
3	Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4	2009, 2010 Free Software Foundation, Inc.
5
6	This file is part of GNU Emacs.
7
8	GNU Emacs is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by
10	the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.
12
13	GNU Emacs is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.
17
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/>. */
20
21	/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
22	(do not change this comment) */


diff --git a/src/m/hp800.h b/src/m/hp800.h deleted file mode 100644 index 9998f701a6b..00000000000 --- a/src/m/hp800.h +++ /dev/null
@@ -1,29 +0,0 @@
1	/* machine description file for hp9000 series 800 machines.
2
3	Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
4	2009, 2010 Free Software Foundation, Inc.
5
6	This file is part of GNU Emacs.
7
8	GNU Emacs is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by
10	the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.
12
13	GNU Emacs is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.
17
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/>. */
20
21	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
22	the bit field into an int. In other words, if bit fields
23	are always unsigned.
24
25	This flag only matters if you use USE_LISP_UNION_TYPE. */
26	#define EXPLICIT_SIGN_EXTEND
27
28	/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
29	(do not change this comment) */


diff --git a/src/m/ia64.h b/src/m/ia64.h index bbf09ac878b..48ba3005cd6 100644 --- a/src/m/ia64.h +++ b/src/m/ia64.h
@@ -1,9 +1,8 @@
1	/* machine description file for the IA-64 architecture.	1	/* machine description file for the IA-64 architecture.
2		2
3	Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 2000-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	Contributed by David Mosberger <davidm@hpl.hp.com>	5	Contributed by David Mosberger <davidm@hpl.hp.com>
7		6
8	This file is part of GNU Emacs.	7	This file is part of GNU Emacs.
9		8
@@ -31,13 +30,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
31	#define EMACS_INT long	30	#define EMACS_INT long
32	#define EMACS_UINT unsigned long	31	#define EMACS_UINT unsigned long
33		32
34	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
35	the 24-bit bit field into an int. In other words, if bit fields
36	are always unsigned.
37
38	This flag only matters if you use USE_LISP_UNION_TYPE. */
39	#define EXPLICIT_SIGN_EXTEND
40
41	/* Data type of load average, as read out of kmem. */	33	/* Data type of load average, as read out of kmem. */
42	#define LOAD_AVE_TYPE long	34	#define LOAD_AVE_TYPE long
43		35
@@ -54,5 +46,3 @@ extern void r_alloc_free ();
54	#endif /* not _MALLOC_INTERNAL */	46	#endif /* not _MALLOC_INTERNAL */
55	#endif /* REL_ALLOC */	47	#endif /* REL_ALLOC */
56		48
57	/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
58	(do not change this comment) */


diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h index 785719e908b..ca2188bc068 100644 --- a/src/m/ibmrs6000.h +++ b/src/m/ibmrs6000.h
@@ -1,7 +1,6 @@
1	/* R2 AIX machine/system dependent defines	1	/* R2 AIX machine/system dependent defines
2		2
3	Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 1988, 2001-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -45,5 +44,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
45	#define BROKEN_SIGPTY	44	#define BROKEN_SIGPTY
46	#define BROKEN_SIGPOLL	45	#define BROKEN_SIGPOLL
47		46
48	/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
49	(do not change this comment) */


diff --git a/src/m/ibms390.h b/src/m/ibms390.h index 0acc826a1ea..f2aef1ba513 100644 --- a/src/m/ibms390.h +++ b/src/m/ibms390.h
@@ -1,7 +1,6 @@
1	/* Machine description file for IBM S390 in 32-bit mode	1	/* Machine description file for IBM S390 in 32-bit mode
2		2
3	Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,	3	Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
4	2008, 2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -19,13 +18,6 @@ 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/>. */	18	along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20		19
21		20
22	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
23	the 24-bit bit field into an int. In other words, if bit fields
24	are always unsigned.
25
26	This flag only matters if you use USE_LISP_UNION_TYPE. */
27	#define EXPLICIT_SIGN_EXTEND
28
29	/* Data type of load average, as read out of kmem. */	21	/* Data type of load average, as read out of kmem. */
30	#define LOAD_AVE_TYPE long	22	#define LOAD_AVE_TYPE long
31		23
@@ -40,5 +32,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
40	numerically. */	32	numerically. */
41	#define VIRT_ADDR_VARIES	33	#define VIRT_ADDR_VARIES
42		34
43	/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
44	(do not change this comment) */


diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h index 6cbfbbcdbd4..d4ef5c291ef 100644 --- a/src/m/ibms390x.h +++ b/src/m/ibms390x.h
@@ -1,7 +1,6 @@
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-2011 Free Software Foundation, Inc.
4	Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -27,18 +26,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
27	#define EMACS_INT long	26	#define EMACS_INT long
28	#define EMACS_UINT unsigned long	27	#define EMACS_UINT unsigned long
29		28
30	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
31	the 24-bit bit field into an int. In other words, if bit fields
32	are always unsigned.
33
34	This flag only matters if you use USE_LISP_UNION_TYPE. */
35	#undef EXPLICIT_SIGN_EXTEND
36
37	/* On the 64 bit architecture, we can use 60 bits for addresses */	29	/* On the 64 bit architecture, we can use 60 bits for addresses */
38	#define VALBITS 60	30	#define VALBITS 60
39		31
40	/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */	32	/* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
41	#define XPNTR(a) XUINT (a)	33	#define XPNTR(a) XUINT (a)
42		34
43	/* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
44	(do not change this comment) */


diff --git a/src/m/intel386.h b/src/m/intel386.h index 15601fae76e..16f0645715c 100644 --- a/src/m/intel386.h +++ b/src/m/intel386.h
@@ -1,7 +1,6 @@
1	/* Machine description file for intel 386.	1	/* Machine description file for intel 386.
2		2
3	Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -30,5 +29,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30	#define ULIMIT_BREAK_VALUE (3210241024)	29	#define ULIMIT_BREAK_VALUE (3210241024)
31	#endif	30	#endif
32		31
33	/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
34	(do not change this comment) */


diff --git a/src/m/iris4d.h b/src/m/iris4d.h index 31f08d05cfc..881f71f846f 100644 --- a/src/m/iris4d.h +++ b/src/m/iris4d.h
@@ -1,7 +1,6 @@
1	/* machine description file for Iris-4D machines. Use with s/irix*.h.	1	/* machine description file for Iris-4D machines. Use with s/irix*.h.
2		2
3	Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -19,18 +18,9 @@ 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/>. */	18	along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20		19
21		20
22	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
23	the bit field into an int. In other words, if bit fields
24	are always unsigned.
25
26	This flag only matters if you use USE_LISP_UNION_TYPE. */
27	#define EXPLICIT_SIGN_EXTEND
28
29	/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which	21	/* DATA_SEG_BITS forces extra bits to be or'd in with any pointers which
30	were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for	22	were stored in a Lisp_Object (as Emacs uses fewer than 32 bits for
31	the value field of a LISP_OBJECT). */	23	the value field of a LISP_OBJECT). */
32	#define DATA_START 0x10000000	24	#define DATA_START 0x10000000
33	#define DATA_SEG_BITS 0x10000000	25	#define DATA_SEG_BITS 0x10000000
34		26
35	/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
36	(do not change this comment) */


diff --git a/src/m/m68k.h b/src/m/m68k.h index 8d53424ccec..16e0b9f0bef 100644 --- a/src/m/m68k.h +++ b/src/m/m68k.h
@@ -1,7 +1,6 @@
1	/* Machine description file for generic Motorola 68k.	1	/* Machine description file for generic Motorola 68k.
2		2
3	Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,	3	Copyright (C) 1985, 1995, 2001-2011 Free Software Foundation, Inc.
4	2008, 2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -24,13 +23,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
24	#define m68k	23	#define m68k
25	#endif	24	#endif
26		25
27	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
28	the 24-bit bit field into an int. In other words, if bit fields
29	are always unsigned.
30
31	This flag only matters if you use USE_LISP_UNION_TYPE. */
32	#define EXPLICIT_SIGN_EXTEND
33
34	#ifdef GNU_LINUX	26	#ifdef GNU_LINUX
35	#ifdef __ELF__	27	#ifdef __ELF__
36	#define DATA_SEG_BITS 0x80000000	28	#define DATA_SEG_BITS 0x80000000
@@ -38,5 +30,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
38		30
39	#endif	31	#endif
40		32
41	/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
42	(do not change this comment) */


diff --git a/src/m/macppc.h b/src/m/macppc.h index 01735790b20..5d78e39bdba 100644 --- a/src/m/macppc.h +++ b/src/m/macppc.h
@@ -1,7 +1,6 @@
1	/* machine description file For the powerpc Macintosh.	1	/* machine description file For the powerpc Macintosh.
2		2
3	Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 1994, 2001-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -30,5 +29,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
30	#endif	29	#endif
31	#endif	30	#endif
32		31
33	/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
34	(do not change this comment) */


diff --git a/src/m/mips.h b/src/m/mips.h deleted file mode 100644 index b3a754c2b61..00000000000 --- a/src/m/mips.h +++ /dev/null
@@ -1,29 +0,0 @@
1	/* m- file for Mips machines.
2
3	Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
4	2007, 2008, 2009, 2010 Free Software Foundation, Inc.
5
6	This file is part of GNU Emacs.
7
8	GNU Emacs is free software: you can redistribute it and/or modify
9	it under the terms of the GNU General Public License as published by
10	the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.
12
13	GNU Emacs is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.
17
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/>. */
20
21	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
22	the 24-bit bit field into an int. In other words, if bit fields
23	are always unsigned.
24
25	This flag only matters if you use USE_LISP_UNION_TYPE. */
26	#define EXPLICIT_SIGN_EXTEND
27
28	/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
29	(do not change this comment) */


diff --git a/src/m/sh3.h b/src/m/sh3.h deleted file mode 100644 index ebfdb5b2d64..00000000000 --- a/src/m/sh3.h +++ /dev/null
@@ -1,4 +0,0 @@
1	/* Machine description file for SuperH. */
2
3	/* arch-tag: 1b01b84f-f044-4afa-aa4b-caa54ec38966
4	(do not change this comment) */


diff --git a/src/m/sparc.h b/src/m/sparc.h index 26ca3caaebe..50e56f0f3dc 100644 --- a/src/m/sparc.h +++ b/src/m/sparc.h
@@ -1,7 +1,6 @@
1	/* machine description file for Sun 4 SPARC.	1	/* machine description file for Sun 4 SPARC.
2		2
3	Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,	3	Copyright (C) 1987, 2001-2011 Free Software Foundation, Inc.
4	2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -20,10 +19,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
20		19
21	/* __sparc__ is defined by the compiler by default. */	20	/* __sparc__ is defined by the compiler by default. */
22		21
23	/* XINT must explicitly sign-extend
24	This flag only matters if you use USE_LISP_UNION_TYPE. */
25	#define EXPLICIT_SIGN_EXTEND
26
27	/* Data type of load average, as read out of kmem. */	22	/* Data type of load average, as read out of kmem. */
28	#define LOAD_AVE_TYPE long	23	#define LOAD_AVE_TYPE long
29		24
@@ -40,5 +35,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
40		35
41	#endif /* __arch64__ */	36	#endif /* __arch64__ */
42		37
43	/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
44	(do not change this comment) */


diff --git a/src/m/template.h b/src/m/template.h index 4efc9158a45..f06f62b6cda 100644 --- a/src/m/template.h +++ b/src/m/template.h
@@ -1,7 +1,6 @@
1	/* machine description file template.	1	/* machine description file template.
2		2
3	Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,	3	Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
4	2008, 2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -22,13 +21,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
22	does not define it automatically.	21	does not define it automatically.
23	Ones defined so far include m68k and many others */	22	Ones defined so far include m68k and many others */
24		23
25	/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
26	the 24-bit bit field into an int. In other words, if bit fields
27	are always unsigned.
28
29	This flag only matters if you use USE_LISP_UNION_TYPE. */
30	#define EXPLICIT_SIGN_EXTEND
31
32	/* Data type of load average, as read out of kmem. */	24	/* Data type of load average, as read out of kmem. */
33	#define LOAD_AVE_TYPE long	25	#define LOAD_AVE_TYPE long
34		26
@@ -55,5 +47,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
55	you should also check `etc/MACHINES' to make sure its descriptions	47	you should also check `etc/MACHINES' to make sure its descriptions
56	of known problems in that configuration should be updated. */	48	of known problems in that configuration should be updated. */
57		49
58	/* arch-tag: d7dae0a9-4f99-4939-bef9-5738e1f33955
59	(do not change this comment) */


diff --git a/src/m/vax.h b/src/m/vax.h index 16e790a2769..2fecf17ca84 100644 --- a/src/m/vax.h +++ b/src/m/vax.h
@@ -1,7 +1,6 @@
1	/* machine description file for vax.	1	/* machine description file for vax.
2		2
3	Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007,	3	Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
4	2008, 2009, 2010 Free Software Foundation, Inc.
5		4
6	This file is part of GNU Emacs.	5	This file is part of GNU Emacs.
7		6
@@ -32,5 +31,3 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
32		31
33	#define HAVE_FTIME	32	#define HAVE_FTIME
34		33
35	/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
36	(do not change this comment) */


diff --git a/src/m/xtensa.h b/src/m/xtensa.h deleted file mode 100644 index 8e1da54b25b..00000000000 --- a/src/m/xtensa.h +++ /dev/null
@@ -1,6 +0,0 @@
1	/* Machine description file for Tensilica Xtensa.
2
3	Add a license notice if this grows to > 10 lines of code. */
4
5	/* arch-tag: fe5872de-d565-4d81-8fe0-ea19865b3e6a
6	(do not change this comment) */