From d5ff9cd0468a844d90181c5a6591bdabd2a45acd Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sun, 20 Nov 2011 10:24:06 +0100 Subject: [PATCH] * 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". --- ChangeLog | 4 ++++ admin/CPP-DEFINES | 3 --- admin/ChangeLog | 4 ++++ configure.in | 1 - src/ChangeLog | 5 +++++ src/m/ibms390.h | 22 ---------------------- src/m/ibms390x.h | 2 -- 7 files changed, 13 insertions(+), 28 deletions(-) delete mode 100644 src/m/ibms390.h diff --git a/ChangeLog b/ChangeLog index a082dc5b08..bccedc607b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Andreas Schwab + + * configure.in: Remove reference to src/m/ibms390.h. + 2011-11-13 Glenn Morris * INSTALL: Tiny updates for disk space used during installation. diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index 9723ca720e..c5f8c7ab31 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 6030dd8f6d..f72f1d881c 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,7 @@ +2011-11-20 Andreas Schwab + + * CPP-DEFINES (VIRT_ADDR_VARIES): Remove. + 2011-11-16 Juanma Barranquero * admin.el (manual-dvi): Fix typo. diff --git a/configure.in b/configure.in index 73e1d07edb..204c0e650a 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 857fe6eaaa..75eeebd7b5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Andreas Schwab + + * m/ibms390.h: Remove. + * m/ibms390x.h: Don't include "ibms390.h". + 2011-11-20 Stefan Monnier * 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 7269d416a4..0000000000 --- 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 . */ - -/* 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 04092d6e1a..5ea7974b05 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 . */ -#include "ibms390.h" - #define BITS_PER_LONG 64 #define BITS_PER_EMACS_INT 64 -- 2.20.1