Merge from trunk

13 files changed, 14 insertions, 53 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 0e7d182fee..9ae089bfc5 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,
-  2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1994, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
@@ -59,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 867d65f660..2ae5d07390 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
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -40,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/ia64.h b/src/m/ia64.h
index e9cf07b678..48ba3005cd 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 2000-2011  Free Software Foundation, Inc.
 
-Contributed by David Mosberger <[email protected]>
+     Contributed by David Mosberger <[email protected]>
 
 This file is part of GNU Emacs.
 
@@ -47,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 785719e908..ca2188bc06 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1988, 2001-2011  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 1a19f7233a..f2aef1ba51 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,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2011 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -33,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 2ef14a2294..d4ef5c291e 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
-  Free Software Foundation, Inc.
+Copyright (C) 2002-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -33,5 +32,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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 15601fae76..16f0645715 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1987, 2001-2011  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 9e80324ee9..881f71f846 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -25,5 +24,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #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 df930d511f..16e0b9f0be 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,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1985, 1995, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -31,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 01735790b2..5d78e39bdb 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2011  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/sparc.h b/src/m/sparc.h
index fc5ea95c0e..50e56f0f3d 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,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1987, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -36,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 0d8e78622a..f06f62b6cd 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,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -48,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 16e790a276..2fecf17ca8 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,
-  2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2011  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) */