--- a/src/m/acorn.h	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/m/acorn.h	Mon Aug 13 11:35:02 2007 +0200
@@ -20,19 +20,6 @@
 
 /* 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
-
-/* Define how to take a char and sign-extend into an int.
-   On machines where char is signed, this is a no-op.  */
-
-/* ARM note - The RISCiX Norcroft C Compiler has ALL
-   non-32-bit types as unsigned */
-
-#define SIGN_EXTEND_CHAR(c) (((int)(c) << 24) >> 24)
-
 /* 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,
@@ -40,14 +27,6 @@
 
 /* ARM note - this is done by the Norcroft compiler - symbol is `__arm' */
 
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
 #ifdef LDAV_SYMBOL
 #undef LDAV_SYMBOL
 #endif
@@ -85,15 +64,6 @@
 
 #undef CANNOT_DUMP
 
-/* 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.  */
-
-#undef VIRT_ADDR_VARIES
-
 /* This prevents Emacs dumping an unsqueezed binary with the
    SQUEEZE bit set in the magic number. */