12 files changed, 12 insertions, 51 deletions

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 3a27cfd65d9..2a97a3d5b0c 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,6 +1,6 @@
 /* Machine description file for the alpha chip.
 
-Copyright (C) 1994, 1997, 1999, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1994, 1997, 1999, 2001-2012  Free Software Foundation, Inc.
 
 Author: Rainer Schoepf
 (according to authors.el)
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef __ELF__
 
-#if !defined(GNU_LINUX) && !defined(__NetBSD__)
+#if !defined (GNU_LINUX) && !defined (__NetBSD__)
 #define DATA_START    0x140000000
 #endif
 
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 50fcf8e7872..f0482c733f9 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,6 +1,6 @@
 /* machine description file for AMD x86-64.
 
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 7a8866a9503..2ddc2fdfb17 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,6 @@
 /* machine description file for the IA-64 architecture.
 
-Copyright (C) 2000-2011  Free Software Foundation, Inc.
+Copyright (C) 2000-2012  Free Software Foundation, Inc.
 
      Contributed by David Mosberger <davidm@hpl.hp.com>
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index ca2188bc068..9798ad2d3d7 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-2011  Free Software Foundation, Inc.
+Copyright (C) 1988, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
deleted file mode 100644
index c309035dc5c..00000000000
--- a/src/m/ibms390.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Machine description file for IBM S390 in 32-bit mode
-
-Copyright (C) 1985-1986, 2001-2011 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 VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 04092d6e1ac..aa652a8206a 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,6 +1,6 @@
 /* Machine description file for IBM S390 in 64-bit mode
 
-Copyright (C) 2002-2011  Free Software Foundation, Inc.
+Copyright (C) 2002-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -17,8 +17,6 @@ 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/>.  */
 
-#include "ibms390.h"
-
 #define BITS_PER_LONG 64
 #define BITS_PER_EMACS_INT 64
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 16f0645715c..78a43e92c21 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-2011  Free Software Foundation, Inc.
+Copyright (C) 1987, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -19,7 +19,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
 #ifdef WINDOWSNT
-#define VIRT_ADDR_VARIES
 #define DATA_START      get_data_start ()
 #endif
 
@@ -28,4 +27,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* we cannot get the maximum address for brk */
 #define ULIMIT_BREAK_VALUE (32*1024*1024)
 #endif
-
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 16e0b9f0bef..120a2bad293 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,6 +1,6 @@
 /* Machine description file for generic Motorola 68k.
 
-Copyright (C) 1985, 1995, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985, 1995, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/macppc.h b/src/m/macppc.h
index aef781e2c39..0303ead25d6 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,6 @@
 /* machine description file For the powerpc Macintosh.
 
-Copyright (C) 1994, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1994, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 99668043f30..27b6070ba87 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-2011  Free Software Foundation, Inc.
+Copyright (C) 1987, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/template.h b/src/m/template.h
index 54fb0da9521..5f1a46c86e1 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,6 +1,6 @@
 /* machine description file template.
 
-Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -21,14 +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 VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-#define VIRT_ADDR_VARIES
-
 /* After adding support for a new machine, modify the large case
    statement in configure.in to recognize reasonable
    configuration names, and add a description of the system to
diff --git a/src/m/vax.h b/src/m/vax.h
index a375600cead..e4bed4090b9 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,6 +1,6 @@
 /* machine description file for vax.
 
-Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
+Copyright (C) 1985-1986, 2001-2012  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.