--- a/src/m/arm.h	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/m/arm.h	Mon Aug 13 11:20:41 2007 +0200
@@ -20,6 +20,11 @@
 
 /* Synched up with: FSF 19.31. */
 
+/* Define WORD_MACHINE if addresses and such have
+ * to be corrected before they can be used as byte counts.  */
+
+#undef WORD_MACHINE
+
 /* Now define a symbol for the cpu type, if your compiler
    does not define it automatically:
    Ones defined so far include vax, m68000, ns16000, pyramid,
@@ -87,7 +92,16 @@
 #define TEXT_START 0
 #endif /* USG */
 
-#ifdef WIN32_NATIVE
+
+#ifdef USG5_4
+#define DATA_SEG_BITS 0x08000000
+#endif
+
+#ifdef MSDOS
+#define NO_REMAP
+#endif
+
+#ifdef WINDOWSNT
 #define VIRT_ADDR_VARIES
 #define DATA_END 	get_data_end ()
 #define DATA_START 	get_data_start ()
@@ -102,6 +116,17 @@
 #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
 #endif
 
+#if 0
+#ifdef __GNUC__
+/* GCC's alloca() is semi-broken.  See lisp.h.
+
+   This brokenness has been confirmed under both Linux and NetBSD.
+   It may also exist on non-Intel architectures. */
+#define BROKEN_ALLOCA_IN_FUNCTION_CALLS
+#endif
+#endif
+
+
 /* XEmacs change: John Hughes <john@AtlanTech.COM> says using vfork
    under i386-unknown-sysv4.2 makes C-g sometimes cause a SIGSEGV
    in TTY mode; the problem goes away if you use fork */