Remove empty machine description files

* configure.in: Remove reference to removed machine description
files and allow $machine and $machfile to be empty.  Substitute
M_FILE/S_FILE instead of machfile/opsysfile.

* msdos/sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.

* Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
(S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
* src/m/arm.h, src/m/sh3.h, src/m/xtensa.h: Remove files.

6 files changed, 14 insertions, 35 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 732c902b41e..584a81cd88c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-04  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
+        (S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
+        * m/arm.h, m/sh3.h, m/xtensa.h: Remove files.
+
 2010-12-03  Andreas Schwab  <schwab@linux-m68k.org>
 
         * lisp.h (union Lisp_Object): Explicitly declare signedness of
diff --git a/src/Makefile.in b/src/Makefile.in
index 4d45248b396..61b42f17030 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -54,8 +54,8 @@ lwlibdir = ../lwlib
 lispdir = ../lisp
 
 # Configuration files for .o files to depend on.
-M_FILE = $(srcdir)/@machfile@
-S_FILE = $(srcdir)/@opsysfile@
+M_FILE = @M_FILE@
+S_FILE = @S_FILE@
 config_h = config.h $(M_FILE) $(S_FILE)
 
 bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT)
diff --git a/src/config.in b/src/config.in
index 487009b4511..105f343870c 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1053,6 +1053,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to `int' if <sys/types.h> does not define. */
 #undef pid_t
 
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+#undef size_t
+
 /* Define to any substitute for sys_siglist. */
 #undef sys_siglist
 
@@ -1089,7 +1092,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Include the os and machine dependent files.  */
 #include config_opsysfile
-#include config_machfile
+#ifdef config_machfile
+# include config_machfile
+#endif
 
 /* GNUstep needs a bit more pure memory.  Of the existing knobs,
    SYSTEM_PURESIZE_EXTRA seems like the least likely to cause problems.
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/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/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) */