* configure.in: Remove reference to src/m/ibms390.h.

* admin/CPP-DEFINES (VIRT_ADDR_VARIES): Remove.

* src/m/ibms390.h: Remove.
* src/m/ibms390x.h: Don't include "ibms390.h".

7 files changed, 13 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index a082dc5b08a..bccedc607ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * configure.in: Remove reference to src/m/ibms390.h.
+
 2011-11-13  Glenn Morris  <rgm@gnu.org>
 
         * INSTALL: Tiny updates for disk space used during installation.
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 9723ca720e1..c5f8c7ab31f 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -58,9 +58,6 @@ NARROWPROTO
 SEPCHAR
 SYSTEM_TYPE
 
-** Machine specific macros, described in detail in src/m/template.h
-VIRT_ADDR_VARIES
-
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
 
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6030dd8f6d3..f72f1d881c6 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (VIRT_ADDR_VARIES): Remove.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * admin.el (manual-dvi): Fix typo.
diff --git a/configure.in b/configure.in
index 73e1d07edb7..204c0e650a7 100644
--- a/configure.in
+++ b/configure.in
@@ -416,7 +416,6 @@ case "${canonical}" in
     opsys=gnu-linux
     case ${canonical} in
       alpha*)   machine=alpha ;;
-      s390-*)   machine=ibms390 ;;
       s390x-*)  machine=ibms390x ;;
       powerpc*) machine=macppc ;;
       sparc*)   machine=sparc ;;
diff --git a/src/ChangeLog b/src/ChangeLog
index 857fe6eaaaf..75eeebd7b5c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * m/ibms390.h: Remove.
+        * m/ibms390x.h: Don't include "ibms390.h".
+
 2011-11-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * fileio.c (Finsert_file_contents): Add missing gcpro1 variable.
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
deleted file mode 100644
index 7269d416a48..00000000000
--- a/src/m/ibms390.h
+++ /dev/null
@@ -1,22 +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/>.  */
-
-/* This file is a placeholder -- it does not contain any definitions.
-   At some point we should probably fix this by removing the file
-   and removing all uses of it.  */
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 04092d6e1ac..5ea7974b052 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -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