Sync to HEAD

100 files changed, 299 insertions, 51 deletions

diff --git a/src/m/7300.h b/src/m/7300.h
index 3db16e67fb6..17dde0c9180 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -92,3 +92,6 @@ Boston, MA 02111-1307, USA.  */
 /* Insist on using cc when compiling this.  GCC may have been
    configured to use GAS syntax, which causes problems.  */
 #define CRT0_COMPILE cc -c -O -Demacs
+
+/* arch-tag: 66219dc7-ef45-4f0c-bb98-f35421f39c8d
+   (do not change this comment) */
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 38b148b3d2e..6f0a77be44c 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -179,3 +179,6 @@ do
 this
 yet
 #endif
+
+/* arch-tag: acee2955-8c49-4b40-813c-579f76f4c0c3
+   (do not change this comment) */
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index dabad592c39..213af43266b 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -124,3 +124,6 @@ unexec_text_start = hdr.a_text_addr;}
 
 /* Use the K&R version of the DEFUN macro.  */
 #define USE_NONANSI_DEFUN
+
+/* arch-tag: 8ba70b15-d082-40f6-931d-14adfd7f9dbd
+   (do not change this comment) */
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 3b79a3c1709..c9c1c70cc95 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -117,3 +117,6 @@ unexec_text_start = hdr.a_text_addr;}
    a variable name causes errors when compiling under ANSI C.  */
 
 #define vector xxvector
+
+/* arch-tag: 0ad5f932-f29a-4458-a24c-496cafdfd50d
+   (do not change this comment) */
diff --git a/src/m/alliant1.h b/src/m/alliant1.h
index 2e061227b47..ca597ac2762 100644
--- a/src/m/alliant1.h
+++ b/src/m/alliant1.h
@@ -7,3 +7,6 @@
 
 #define ALLIANT_1
 #include "alliant.h"
+
+/* arch-tag: 516688f9-4b94-4356-9bf0-92b2d72e664e
+   (do not change this comment) */
diff --git a/src/m/alliant4.h b/src/m/alliant4.h
index 7e24c53eb89..2ab0a6bde1d 100644
--- a/src/m/alliant4.h
+++ b/src/m/alliant4.h
@@ -22,3 +22,6 @@
 
 /* include <sys/param.h> for the definition of LOADAVG_SCALE, and also
    LOADAVG_SIZE, the number of items in the Loadavg array. */
+
+/* arch-tag: cf917b55-c95e-4079-a4d1-d31e00c61b66
+   (do not change this comment) */
diff --git a/src/m/alpha.h b/src/m/alpha.h
index b37116b0d48..3e1d378b292 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -149,3 +149,6 @@ NOTE-END
    Define DBL_MIN_REPLACEMENT to be the next value larger than DBL_MIN:
    this avoids the assembler bug.  */
 #define DBL_MIN_REPLACEMENT 2.2250738585072019e-308
+
+/* arch-tag: 978cb578-1e25-4a60-819b-adae0972aa78
+   (do not change this comment) */
diff --git a/src/m/altos.h b/src/m/altos.h
index 654acc1d5c1..b71d006f241 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -53,3 +53,6 @@ Boston, MA 02111-1307, USA.  */
 #ifdef __GNUC__
 #define COFF_ENCAPSULATE
 #endif
+
+/* arch-tag: 4572d0ff-70bb-445f-80f1-2bbac3cf47cb
+   (do not change this comment) */
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index 4e64d0dca85..37cb8c0d362 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -134,3 +134,6 @@ extern int sign_extend_temp;
 
 /* Compensate for error in signal.h.  */
 #define NSIG_MINIMUM 20
+
+/* arch-tag: cf665976-ddb1-49b0-b383-371e17f36acf
+   (do not change this comment) */
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 8043ca0178b..0192afc9d45 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -97,20 +97,14 @@ Boston, MA 02111-1307, USA.  */
 
 #define PNTR_COMPARISON_TYPE unsigned long
 
-/* On the 64 bit architecture, we can use 60 bits for addresses */
-
-#define VALBITS         60
-
-/* Define XINT and XUINT so that they can take arguments of type int */
-#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-#define XUINT(a) ((long) (a) & VALMASK)
-
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
-
-#define XPNTR(a) XUINT (a)
+#undef DATA_SEG_BITS
 
 #undef START_FILES
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+
+/* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
+   (do not change this comment) */
diff --git a/src/m/apollo.h b/src/m/apollo.h
index 83af7496e01..e28ffef3379 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -90,3 +90,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* In SR10.4, unistd.h has bad prototype for getpgrp, so we don't include it. */
 #undef HAVE_UNISTD_H
+
+/* arch-tag: 33336588-6242-4e2e-a194-e38848b12813
+   (do not change this comment) */
diff --git a/src/m/arm.h b/src/m/arm.h
index 4dafe6819fa..d3a95521e79 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -48,3 +48,6 @@ Boston, MA 02111-1307, USA.  */
 #define NO_UNION_TYPE
 
 #define NO_REMAP
+
+/* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
+   (do not change this comment) */
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 46b101dfa4c..559ac2f3c6c 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -144,3 +144,6 @@ extern int sign_extend_temp;
 
 /* This affects filemode.c.  */
 #define NO_MODE_T
+
+/* arch-tag: 07441a37-d630-447f-94fa-7da19645c97a
+   (do not change this comment) */
diff --git a/src/m/aviion-intel.h b/src/m/aviion-intel.h
index 1f422ac0716..eb93a43214f 100644
--- a/src/m/aviion-intel.h
+++ b/src/m/aviion-intel.h
@@ -17,3 +17,6 @@
 #endif
 
 #undef  m88k                       /* It sure is NOT a Motorola machine */
+
+/* arch-tag: 7cbf89ef-237c-4da5-bdd0-8d569ae5f3ce
+   (do not change this comment) */
diff --git a/src/m/aviion.h b/src/m/aviion.h
index c86eb85d02c..7705ef645fb 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -121,3 +121,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define SECTION_ALIGNMENT 0x7
 
+/* arch-tag: 9de8e6ed-ddd8-4480-8308-17ddd7c86559
+   (do not change this comment) */
diff --git a/src/m/celerity.h b/src/m/celerity.h
index c38d144d9b4..55beedb7c41 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -54,3 +54,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* (short) negative-int doesn't sign-extend correctly */
 #define SHORT_CAST_BUG
+
+/* arch-tag: b4df1828-fab6-48f8-97bc-b8998c200eea
+   (do not change this comment) */
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 8391d7237ef..dc4dd0c2df8 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -92,3 +92,6 @@ Boston, MA 02111-1307, USA.  */
 #endif /* USG */
 
 #define LD_TEXT_START_ADDR 8000
+
+/* arch-tag: 2f7981c1-7018-4a1e-b7b6-b2900de36a04
+   (do not change this comment) */
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index 5f76da4bb22..d44eff6700c 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -91,3 +91,6 @@ Boston, MA 02111-1307, USA.  */
    Cause crt0.c to define errno.  */
 
 #define NEED_ERRNO
+
+/* arch-tag: 1a227f79-37e4-43af-a186-53c61296b0be
+   (do not change this comment) */
diff --git a/src/m/convex.h b/src/m/convex.h
index 29797fc1314..a871d4ac214 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -183,3 +183,6 @@ Boston, MA 02111-1307, USA.  */
 /* There is some indication that the convex has sys/wait.h
    but it does not work right.  */
 #undef HAVE_SYS_WAIT_H
+
+/* arch-tag: 127e5ae1-4f03-40c0-a87e-d2cb02c59de8
+   (do not change this comment) */
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index 7f227e36df9..12b757305ba 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -111,3 +111,6 @@ Boston, MA 02111-1307, USA.  */
 /* We can't do interrupt-driven input, so don't let user try.  */
 
 #define BROKEN_SIGIO
+
+/* arch-tag: ad70aae4-1f54-4e67-8677-6eeafb9bcbd9
+   (do not change this comment) */
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 0b574ef0ca4..89889824fd1 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -157,3 +157,6 @@ Boston, MA 02111-1307, USA.  */
 #define NO_PTY_H
 
 #define USE_GETOBAUD
+
+/* arch-tag: c8ea1965-99d7-43df-ba32-29b66fc069be
+   (do not change this comment) */
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 282c4bd877e..1a2b99cdffc 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -217,3 +217,5 @@ Boston, MA 02111-1307, USA.  */
  /* end of dpx2.h */
 
 
+/* arch-tag: 8cfdf817-aec7-4d99-a00d-0e77615e8e1b
+   (do not change this comment) */
diff --git a/src/m/dual.h b/src/m/dual.h
index d00a30d9345..392cb64eb49 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -67,3 +67,6 @@ NOTE-END */
 /* Change some things to avoid bugs in compiler */
 
 #define SWITCH_ENUM_BUG 1
+
+/* arch-tag: 7208d63c-9a23-469e-a9b1-908ac912c743
+   (do not change this comment) */
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index b392e07c5f0..1795d9815d3 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -127,3 +127,6 @@ Boston, MA 02111-1307, USA.  */
 extern int _init_brk;\
 _init_brk = bss_start;\
 }
+
+/* arch-tag: 73bf1120-a994-4c29-8d60-af425d8bf10c
+   (do not change this comment) */
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index 5f5f9cae000..b782542348c 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -36,3 +36,6 @@ Boston, MA 02111-1307, USA.  */
 #undef C_DEBUG_SWITCH
 #define C_DEBUG_SWITCH -O  -KOlimit=3000 -ZXNd=5000
 #endif  /* !__GNUC__ */
+
+/* arch-tag: 27f72f54-45cd-40a3-b182-345127f04955
+   (do not change this comment) */
diff --git a/src/m/f301.h b/src/m/f301.h
index 1ec0b221386..c427c19e05d 100644
--- a/src/m/f301.h
+++ b/src/m/f301.h
@@ -5,3 +5,6 @@
    USUAL-OPSYS="uxpv"  */
 
 #include "delta88k.h"
+
+/* arch-tag: a0ed4f18-ecf2-4d9a-853b-36e0f6b45945
+   (do not change this comment) */
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index fcbeac3b6ca..145d682afb1 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -103,3 +103,5 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 
+/* arch-tag: cdfd3dbf-a5e4-464d-8cef-985fb7872873
+   (do not change this comment) */
diff --git a/src/m/gould.h b/src/m/gould.h
index af77843a9f2..eeac2aef2f6 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -183,3 +183,6 @@ NOTE-END */
    with `environ' the way most standard crt0.o's do.  */
 
 #define START_FILES pre-crt0.o /lib/crt0.o
+
+/* arch-tag: 930cb9ef-f56f-4c06-aea0-5e81103bbf58
+   (do not change this comment) */
diff --git a/src/m/hp800.h b/src/m/hp800.h
index bc51b31836a..8f08ed3b617 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -67,12 +67,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-
-#if 0  /* Loses when sign bit of type field is set.  */
-#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#endif
 
 /* Common definitions for HPUX and GNU/Linux.  */
 
@@ -179,3 +173,6 @@ Boston, MA 02111-1307, USA.  */
 #define rindex strrchr
 
 #endif /* __hpux */
+
+/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
+   (do not change this comment) */
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index ad4ca111664..24c9a521d0c 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -222,3 +222,6 @@ NOTE-END */
 #endif
 
 #endif /* not BSD4_3 */
+
+/* arch-tag: 6e0001a5-ed62-4258-9235-204348f6bdb9
+   (do not change this comment) */
diff --git a/src/m/i860.h b/src/m/i860.h
index 48222538380..9d56b886f62 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -95,3 +95,6 @@ Boston, MA 02111-1307, USA.  */
 #define SVR4
 #endif
 #endif
+
+/* arch-tag: 99f3a078-95e1-49d6-8666-04726eb25647
+   (do not change this comment) */
diff --git a/src/m/ia64.h b/src/m/ia64.h
index a765fab1543..7114382d513 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -119,15 +119,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define PNTR_COMPARISON_TYPE unsigned long
 
-/* On the 64 bit architecture, we can use 60 bits for addresses */
-
-#define VALBITS         60
-
-/* Define XINT and XUINT so that they can take arguments of type int */
-
-#define XINT(a)  (((long) (a) << (BITS_PER_LONG - VALBITS)) >> (BITS_PER_LONG - VALBITS))
-#define XUINT(a) ((long) (a) & VALMASK)
-
 #ifndef NOT_C_CODE
 
 #ifdef REL_ALLOC
@@ -145,3 +136,6 @@ extern void r_alloc_free ();
 #define DATA_SEG_BITS   0x6000000000000000
 
 #define HAVE_TEXT_START
+
+/* arch-tag: 9b8e9fb2-2e49-4c22-b68f-11a488e77c66
+   (do not change this comment) */
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 32dc30089a5..3fb228afa18 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -53,3 +53,6 @@ Boston, MA 02111-1307, USA.  */
 
 #undef LD_SWITCH_MACHINE
 #define LD_SWITCH_MACHINE -xa
+
+/* arch-tag: 8605b600-0580-4e49-9ba9-8b4a977f860a
+   (do not change this comment) */
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index a29d916451d..eb843ffe71b 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -230,3 +230,6 @@ so disable it for them.  */
 #define LD_SWITCH_MACHINE -shlib
 #endif
 #endif
+
+/* arch-tag: 2e7f44df-6a61-4a47-aa53-f7961bfeff11
+   (do not change this comment) */
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 650530bf4c0..5be14b04884 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -182,3 +182,6 @@ Boston, MA 02111-1307, USA.  */
 #define NLIST_STRUCT
 #endif
 #endif /* USG5_4 */
+
+/* arch-tag: 028318ee-a7ae-4a08-804d-cc1e6588d003
+   (do not change this comment) */
diff --git a/src/m/ibmrs6000.inp b/src/m/ibmrs6000.inp
index d28a3aedae1..d7f3fddaf6f 100644
--- a/src/m/ibmrs6000.inp
+++ b/src/m/ibmrs6000.inp
@@ -1,2 +1,4 @@
 #!
 pthread_yield
+
+# arch-tag: fc6d01ea-c488-4862-bbdb-e8d3e0f6fdb3
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 26803238953..8bce9fb6f69 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -159,3 +159,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* rocky@watson.ibm.com says this is needed.  */
 #define HAVE_FTIME
+
+/* arch-tag: eea85307-0ca9-4a9c-a4f6-89fad7591d28
+   (do not change this comment) */
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 587729e1418..9c262640570 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -117,3 +117,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Use the bitmap files that come with Emacs.  */
 #define EMACS_BITMAP_FILES
+
+/* arch-tag: 89aa7e7d-593e-432c-966a-3db6aa2ad665
+   (do not change this comment) */
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index 711681267a4..8797a49d307 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -111,3 +111,6 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
+
+/* arch-tag: d8a0ffa4-a8f0-4736-90d3-7fd7b21b8314
+   (do not change this comment) */
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 7f9f616d25a..e240beb91a3 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -212,3 +212,6 @@ NOTE-END */
 
 #define SEGMENT_MASK ((SEGMENT_SIZE)-1)
 #endif
+
+/* arch-tag: 746338f0-cb7b-4f49-a98c-cb50817cf2ec
+   (do not change this comment) */
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 457f3594636..8d3b7a883bd 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,5 +1,5 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2002, 2003  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -159,7 +159,10 @@ Boston, MA 02111-1307, USA.  */
 #undef FIRST_PTY_LETTER
 #define FIRST_PTY_LETTER 'q'
 
-#ifndef _LP64
+#if _MIPS_SZLONG != 64
+/* fixme: should there be 64-bit defiitions?  (The ones below aren't
+   OK.)  */
+
 /* The standard definitions of these macros would work ok,
    but these are faster because the constants are short.  */
 
@@ -167,8 +170,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XUNMARK(a) ((a) = (((unsigned)(a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
 #endif /* _LP64 */
 
 #ifndef __GNUC__
@@ -185,3 +186,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 
 #endif /* not __GNUC__ */
+
+/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
+   (do not change this comment) */
diff --git a/src/m/irist.h b/src/m/irist.h
index b365371324f..d2b9dd28314 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -130,3 +130,6 @@ NOTE-END */
 
 #define internal_with_output_to_temp_buffer     stupid_long_name1
 #define Finsert_abbrev_table_description        stupid_long_name2
+
+/* arch-tag: 4076b26c-1fe6-4c28-94f3-3c863f074767
+   (do not change this comment) */
diff --git a/src/m/is386.h b/src/m/is386.h
index 0c89fdf91c6..02fe12d93e5 100644
--- a/src/m/is386.h
+++ b/src/m/is386.h
@@ -25,3 +25,6 @@ NOTE-END  */
 #define LIBX11_MACHINE -lnsl_s
 
 #define LIBS_DEBUG -lg
+
+/* arch-tag: b6b7e6ec-8b6c-440b-b9c8-961e4bebf0cf
+   (do not change this comment) */
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index a1ab808923a..ef481e13f2b 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -90,3 +90,6 @@ NOTE-END */
 #define LIB_STANDARD -lmc -lc
 #define C_DEBUG_SWITCH -20 -O -X23
 #endif
+
+/* arch-tag: 3bfb5a11-d94e-4372-923b-9f47d0851f42
+   (do not change this comment) */
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 3391bb17805..ce7b268bbec 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -81,3 +81,6 @@ Boston, MA 02111-1307, USA.  */
 #define NO_REMAP
 #define TEXT_START 0
 #endif
+
+/* arch-tag: 4eadd161-b4e8-4b82-82a1-e4ce7f42969d
+   (do not change this comment) */
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 6f8f841a46c..21ba90ad101 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -104,3 +104,6 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #endif
 #endif /* 0 */
+
+/* arch-tag: 41913e4e-e7d1-4023-aadb-210cc31712ed
+   (do not change this comment) */
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index 0b045794e42..34ea78696c1 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -116,3 +116,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define ADJUST_EXEC_HEADER   \
   hdr.a_stamp = STAMP13; /* really want the latest stamp, whatever it is */
+
+/* arch-tag: 572bf8d1-7a94-48c6-b188-bf69754e0cd2
+   (do not change this comment) */
diff --git a/src/m/mega68.h b/src/m/mega68.h
index fccd495e0d8..e86a5048680 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -47,3 +47,6 @@ Boston, MA 02111-1307, USA.  */
 /* Convert that into an integer that is 100 for a load average of 1.0  */
 
 #define LOAD_AVE_CVT(x) ((int) ((x) * 100.0))
+
+/* arch-tag: 61e6deb4-a93e-444b-bbd5-9887a83f1bbc
+   (do not change this comment) */
diff --git a/src/m/mg1.h b/src/m/mg1.h
index bf6e708bd7e..5a6250c3c31 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -101,3 +101,6 @@ NOTE-END  */
 
 /* Avoids a compiler bug */
 /* borrowed from sequent.h */
+
+/* arch-tag: e15d9072-9e1a-44bf-8add-966be535967b
+   (do not change this comment) */
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index d0935ce6160..11b1f971d27 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -1,5 +1,5 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1993, 1995, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987,1992,1993,95,2002,03  Free Software Foundation, Inc.
 
    This file contains some changes for our SVR4 based SINIX-Mips 5.4.
    I hope this is helpful to port the emacs to our RM?00 series and
@@ -158,8 +158,5 @@ NOTE-END  */
    ((int)(type) << VALBITS)                                             \
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
 
-#define XUNMARK(a)                                                      \
-  ((a) =                                                                \
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))                \
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
-
+/* arch-tag: a4f5c090-0bd5-48f0-9724-b7d531f9b6c8
+   (do not change this comment) */
diff --git a/src/m/mips.h b/src/m/mips.h
index 3948cb6855c..cca45868178 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,5 +1,5 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2002, 2003 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -170,11 +170,6 @@ NOTE-END  */
   ((var) =                                                              \
    ((int)(type) << VALBITS)                                             \
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
-
-#define XUNMARK(a)                                                      \
-  ((a) =                                                                \
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))                \
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
 
 #if !defined (NEWSOS5) && !defined (__linux__)
 #ifdef USG
@@ -217,3 +212,6 @@ NOTE-END  */
 #endif /* BSD_SYSTEM */
 
 #endif /* not NEWSOS5 && not __linux__ */
+
+/* arch-tag: 8fd020ee-78a7-4d87-96ce-6129f52f7bee
+   (do not change this comment) */
diff --git a/src/m/mips4.h b/src/m/mips4.h
index 5371fc03200..4b79e466fb3 100644
--- a/src/m/mips4.h
+++ b/src/m/mips4.h
@@ -57,3 +57,6 @@ NOTE-END  */
 #undef HAVE_XSCREENRESOURCESTRING
 #undef HAVE_SETSID
 #endif
+
+/* arch-tag: 56050454-0df5-4de9-b1b7-0c6ab400313c
+   (do not change this comment) */
diff --git a/src/m/ncr386.h b/src/m/ncr386.h
index 2599456a873..f98566a2959 100644
--- a/src/m/ncr386.h
+++ b/src/m/ncr386.h
@@ -13,3 +13,6 @@
 #define LD_SWITCH_X_DEFAULT -Xlinker LD_SWITCH_X_SITE_AUX
 
 #endif /* __GNUC__ */
+
+/* arch-tag: 79c76283-7d50-499b-b910-8ef980357758
+   (do not change this comment) */
diff --git a/src/m/news-r6.h b/src/m/news-r6.h
index 7018dc9571a..cf6e019fd05 100644
--- a/src/m/news-r6.h
+++ b/src/m/news-r6.h
@@ -49,7 +49,5 @@
    ((int)(type) << VALBITS)                                             \
    + (((unsigned) (ptr) << (BITS_PER_INT-VALBITS)) >> (BITS_PER_INT-VALBITS)))
 
-#define XUNMARK(a)                                                      \
-  ((a) =                                                                \
-   (((unsigned)(a) << (BITS_PER_INT-GCTYPEBITS-VALBITS))                        \
-    >> (BITS_PER_INT-GCTYPEBITS-VALBITS)))
+/* arch-tag: b9fd7b75-ba3c-46d4-8966-24381b13001b
+   (do not change this comment) */
diff --git a/src/m/news-risc.h b/src/m/news-risc.h
index cba5bbc5689..2ecaff41cb9 100644
--- a/src/m/news-risc.h
+++ b/src/m/news-risc.h
@@ -57,3 +57,6 @@
 #define BROKEN_PROTOTYPES
 
 #endif /* not NEWSOS5 */
+
+/* arch-tag: cf17300c-dd34-4b9d-a657-2de718469662
+   (do not change this comment) */
diff --git a/src/m/news.h b/src/m/news.h
index 812432d8f38..1a594ad82a7 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -60,3 +60,5 @@ NOTE-END  */
 
 #define LIBS_TERMCAP -ltermcap
 
+/* arch-tag: 79bfd831-874a-4339-85fa-b8cbdc29bdab
+   (do not change this comment) */
diff --git a/src/m/next.h b/src/m/next.h
index b2ceb49f434..1e8a3d3a31c 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -121,3 +121,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* This should be true for recent NeXT systems.  At least since 3.2.  */
 #define HAVE_MACH_MACH_H
+
+/* arch-tag: 1155cdcb-1f6c-4208-a2da-22c7473060a1
+   (do not change this comment) */
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index 4df55957d90..d6c09bd65b5 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -103,3 +103,6 @@ Boston, MA 02111-1307, USA.  */
  */
 
 /* #define NO_SOCK_SIGIO */
+
+/* arch-tag: 1529f2bc-50d9-42e7-ae72-6f40afadf09e
+   (do not change this comment) */
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index d002405fe13..70804ef2c36 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -102,3 +102,6 @@ Boston, MA 02111-1307, USA.  */
  */
 
 /* #define NO_SOCK_SIGIO */
+
+/* arch-tag: d9e12769-ae79-4c25-953f-70db5b7ef5dd
+   (do not change this comment) */
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index f684c3dcc6d..549f648c7f8 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -89,3 +89,6 @@ NOTE-END  */
 #define static
 
 #endif /* USG */
+
+/* arch-tag: 4210db3c-e35c-4b96-9399-1dbde3e00a57
+   (do not change this comment) */
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index c3183862355..214954b631a 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -96,3 +96,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define START_FILES pre-crt0.o /lib/crt0.o
 #endif
+
+/* arch-tag: 13dde0e0-8ed5-4bc3-a0dc-5456c9db5f94
+   (do not change this comment) */
diff --git a/src/m/nu.h b/src/m/nu.h
index 8eb9374e6da..44abc929053 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -69,3 +69,6 @@ Boston, MA 02111-1307, USA.  */
    in the executable file.  */
 
 #define SECTION_ALIGNMENT pagemask
+
+/* arch-tag: 7d2d9b6d-75d4-4c0d-96a9-a41f06212f35
+   (do not change this comment) */
diff --git a/src/m/orion.h b/src/m/orion.h
index 2a89251e23c..76519f6fe68 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -64,3 +64,6 @@ Boston, MA 02111-1307, USA.  */
 #define FSCALE 1.0
 #endif
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
+
+/* arch-tag: 4fcf38ad-d6b0-434b-bc10-16647d5a7fb6
+   (do not change this comment) */
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 7e5fb34b319..c58f9222068 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -66,3 +66,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* Arguments to ignore before argc in crt0.c.  */
 #define DUMMIES dummy1, dummy2,
+
+/* arch-tag: 32fed6e3-8cae-4882-b327-a68c2af6db7a
+   (do not change this comment) */
diff --git a/src/m/paragon.h b/src/m/paragon.h
index 5c00f7d8d92..11b98dea7ee 100644
--- a/src/m/paragon.h
+++ b/src/m/paragon.h
@@ -8,3 +8,6 @@
 #define KEEP_OLD_TEXT_SCNPTR
 #define KEEP_OLD_PADDR
 #define drem fmod
+
+/* arch-tag: c1bc280c-25e5-4993-9b91-333c52ab3674
+   (do not change this comment) */
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index c417a1d58ad..c6762a93120 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -87,3 +87,6 @@ Boston, MA 02111-1307, USA.  */
 #define NO_SIOCTL_H
 
 #define BROKEN_SIGIO
+
+/* arch-tag: f3a127d5-790b-4c78-b6be-837139fb12c4
+   (do not change this comment) */
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 22dbffa16f9..b7012c750d6 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -103,3 +103,6 @@ Boston, MA 02111-1307, USA.  */
 /* This triggers some stuff to avoid a compiler bug */
 
 #define TAHOE_REGISTER_BUG
+
+/* arch-tag: 78c607eb-b4f8-4750-b575-39670d979448
+   (do not change this comment) */
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 54f246fed65..911f84d3c8a 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -105,3 +105,6 @@ NOTE-END  */
 
 /* Enable a fix in process.c.  */
 #define SET_CHILD_PTY_PGRP
+
+/* arch-tag: 45d5070e-d2b7-479f-b336-3fd497c36e15
+   (do not change this comment) */
diff --git a/src/m/powermac.h b/src/m/powermac.h
index 0ab535dfd23..dc698675eaa 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -109,3 +109,6 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
+
+/* arch-tag: d8af08a6-48b3-4c8a-94a0-0b4acae5e1f0
+   (do not change this comment) */
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index 2c01acb843d..4733156337a 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -56,3 +56,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Control a conditional in unexelf.c.  */
 #define SOLARIS_POWERPC
+
+/* arch-tag: dc2c3cb6-4683-45ae-961f-0a4f2bda3c61
+   (do not change this comment) */
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 7abd4f88b3f..7ba6a9e058e 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -61,3 +61,6 @@ Boston, MA 02111-1307, USA.  */
 /* Reenable this #define for old versions of the Pyramid system.  */
 
 /* #define PYRAMID_OLD */
+
+/* arch-tag: b9097bc9-92be-46d4-acb1-13c2b966d581
+   (do not change this comment) */
diff --git a/src/m/pyrmips.h b/src/m/pyrmips.h
index 1489ddaa664..67705fb6619 100644
--- a/src/m/pyrmips.h
+++ b/src/m/pyrmips.h
@@ -6,3 +6,5 @@
 #define SYSTEM_MALLOC
 #define CANNOT_DUMP
 
+/* arch-tag: 82559148-25a8-466d-bbb3-f903f7666b7a
+   (do not change this comment) */
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index 2c815ff97bb..a72c7055780 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -127,3 +127,5 @@ Boston, MA 02111-1307, USA.  */
 /* Use terminfo library.  */
 #define LIBS_TERMCAP -ltermlib
 
+/* arch-tag: 0494629b-7e11-4f6f-865f-62254ac46099
+   (do not change this comment) */
diff --git a/src/m/sequent.h b/src/m/sequent.h
index 404bbf54668..7e45c4f4fda 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -163,3 +163,6 @@ NOTE-END */
   sprintf (ptyname, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
 #define PTY_TTY_NAME_SPRINTF \
   sprintf (ptyname, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
+
+/* arch-tag: 81caea48-aa64-4021-9544-e969dea71ee8
+   (do not change this comment) */
diff --git a/src/m/sparc.h b/src/m/sparc.h
index 8e22ccb2b21..8656152fb7a 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -97,3 +97,6 @@ NOTE-END  */
                                    should be here.  -- fx */
 #endif
 #endif
+
+/* arch-tag: 0a6f7882-33fd-4811-9832-7466c51e50f7
+   (do not change this comment) */
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 1589f2cbfb2..ba4eae18510 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -112,3 +112,6 @@ Boston, MA 02111-1307, USA.  */
 #define ADJUST_EXEC_HEADER f_hdr.f_magic = SMROMAGIC;\
  f_ohdr.stsize = 0;
 #endif
+
+/* arch-tag: 2240f71c-6f3b-4a82-80fc-4d56c682d7ad
+   (do not change this comment) */
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
index 579432aa3b0..088ea23d94c 100644
--- a/src/m/sr2k.h
+++ b/src/m/sr2k.h
@@ -67,12 +67,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define XSET(var, type, ptr) \
    ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-#define XMARKBIT(a) ((a) < 0)
-
-#if 0  /* Loses when sign bit of type field is set.  */
-#define XUNMARK(a) ((a) = (((a) << BITS_PER_INT-GCTYPEBITS-VALBITS) >> BITS_PER_INT-GCTYPEBITS-VALBITS))
-#endif
 
 /* #ifdef __hpux */
 /* Now define a symbol for the cpu type, if your compiler
@@ -160,3 +154,6 @@ Boston, MA 02111-1307, USA.  */
 #define rindex strrchr
 
 /* #endif */
+
+/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
+   (do not change this comment) */
diff --git a/src/m/stride.h b/src/m/stride.h
index 4e1fd18dc91..941b9d7cc98 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -115,3 +115,6 @@ Boston, MA 02111-1307, USA.  */
 /* Define this macro if system defines a type `union wait'.  */
 
 #define HAVE_UNION_WAIT
+
+/* arch-tag: 65c635ed-5bc7-4ace-ab20-f3442429c8ba
+   (do not change this comment) */
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 6bff1d21677..54d51106e6b 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -74,3 +74,6 @@ NOTE-END  */
 /* Mask for address bits within a memory segment */
 
 #define SEGMENT_MASK (SEGSIZ - 1)
+
+/* arch-tag: 58ec9c79-48bd-4d1b-aad1-65a09a6b0d10
+   (do not change this comment) */
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 5107f3c47d2..33f811aea04 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -95,3 +95,6 @@ NOTE-END  */
 #define SYMS_MACHINE syms_of_sunfns ()
 #define PURESIZE 132000
 #endif
+
+/* arch-tag: 543c3570-74ca-4099-aa47-db7c7b691c8e
+   (do not change this comment) */
diff --git a/src/m/sun3-68881.h b/src/m/sun3-68881.h
index 1210bef6300..33b9c2bd527 100644
--- a/src/m/sun3-68881.h
+++ b/src/m/sun3-68881.h
@@ -26,3 +26,6 @@ NOTE-END  */
 
 #define sun_68881
 #define START_FILES crt0.o /usr/lib/Mcrt1.o
+
+/* arch-tag: f8659e89-5f5e-4921-940c-814a5786b901
+   (do not change this comment) */
diff --git a/src/m/sun3-fpa.h b/src/m/sun3-fpa.h
index 1b2c084e010..b78adaf7378 100644
--- a/src/m/sun3-fpa.h
+++ b/src/m/sun3-fpa.h
@@ -26,3 +26,6 @@ NOTE-END  */
 
 #define sun_fpa
 #define START_FILES crt0.o /usr/lib/Wcrt1.o
+
+/* arch-tag: db287fbb-966f-4a70-a3f4-a6768c09326b
+   (do not change this comment) */
diff --git a/src/m/sun3-soft.h b/src/m/sun3-soft.h
index 0913e875d8a..32b2558c01b 100644
--- a/src/m/sun3-soft.h
+++ b/src/m/sun3-soft.h
@@ -27,3 +27,6 @@ NOTE-END  */
 
 #define sun_soft
 #define START_FILES crt0.o /usr/lib/Fcrt1.o
+
+/* arch-tag: 76e9d7e6-66a8-4c4f-b0a5-335d082e5720
+   (do not change this comment) */
diff --git a/src/m/sun3.h b/src/m/sun3.h
index 24f84d8e2da..b2713703416 100644
--- a/src/m/sun3.h
+++ b/src/m/sun3.h
@@ -48,3 +48,6 @@ NOTE-END  */
    For maximum cleanliness, don't edit this file;
    instead, insert this line in config.h.  */
 /* #define START_FILES crt0.o /usr/lib/Mcrt1.o  */
+
+/* arch-tag: d0559a79-2285-4a78-ad68-9694264d0d8a
+   (do not change this comment) */
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 61468f99879..d3866e8f177 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -80,3 +80,6 @@ NOTE-END  */
    on the 386 needs this.  */
 #define LIBS_MACHINE -lkvm
 #endif
+
+/* arch-tag: 861af4b4-ce5f-475e-876e-ebff6436a1fe
+   (do not change this comment) */
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index a3e89c58490..ca584c9c6e1 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -89,3 +89,6 @@ Boston, MA 02111-1307, USA.  */
   sprintf (pty_name, "/dev/pty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
 #define PTY_TTY_NAME_SPRINTF \
   sprintf (pty_name, "/dev/tty%c%c", PTY_MAJOR[ma], PTY_MINOR[mi]);
+
+/* arch-tag: 4169a89e-3764-4147-98df-1ba3bdd45a5b
+   (do not change this comment) */
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 4aa142fbd91..084e432223e 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -109,3 +109,6 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_PTYS                       /* we do have PTYs if we have TCP */
 #define HAVE_SOCKETS                    /* we do have sockets if we have TCP */
 #define LIBS_SYSTEM -lsocket            /* get TCP networking functions */
+
+/* arch-tag: e0c09754-b0f2-48da-a8a5-aee3c94838f4
+   (do not change this comment) */
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 343247d0529..42741e25cb6 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -66,3 +66,6 @@ NOTE-END  */
 /* This triggers some stuff to avoid a compiler bug */
 
 #define TAHOE_REGISTER_BUG
+
+/* arch-tag: dd452693-80e1-413f-a164-0141eb68d831
+   (do not change this comment) */
diff --git a/src/m/tandem-s2.h b/src/m/tandem-s2.h
index 92e9ebfbb35..b22f9bb66af 100644
--- a/src/m/tandem-s2.h
+++ b/src/m/tandem-s2.h
@@ -19,3 +19,6 @@
 /* Correct some library file names.  */
 #define START_FILES pre-crt0.o /usr/lib/crt1.o1.31
 #define LIB_STANDARD -lbsd -lc /usr/lib/crtn.o1.31
+
+/* arch-tag: ae34a1a6-6408-4b23-a6d3-ce4e8f124916
+   (do not change this comment) */
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 7c44f12e177..afc72f4e0ee 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -92,3 +92,6 @@ Boston, MA 02111-1307, USA.  */
 #define SEGMENT_MASK 0xffff
 
 #define SWITCH_ENUM_BUG 1
+
+/* arch-tag: f2438018-7d4e-4be5-b368-4bf342b7785b
+   (do not change this comment) */
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index d402022a034..34b160ba6da 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -99,3 +99,6 @@ Boston, MA 02111-1307, USA.  */
 /* Process groups work in the traditional BSD manner.  */
 
 #define BSD_PGRPS
+
+/* arch-tag: afa06e53-094c-4a19-9219-155f8ba4bbcc
+   (do not change this comment) */
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 2e1fa20d371..a30bbdd8d6c 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -111,3 +111,6 @@ Boston, MA 02111-1307, USA.  */
 
 /* We need this to get dumping to work */
 #define KEEP_OLD_TEXT_SCNPTR
+
+/* arch-tag: fd3cebc3-2aed-4f8c-be9b-f37331c6e0ff
+   (do not change this comment) */
diff --git a/src/m/template.h b/src/m/template.h
index 6def690cd98..914daa3047c 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -109,3 +109,6 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
+
+/* arch-tag: d7dae0a9-4f99-4939-bef9-5738e1f33955
+   (do not change this comment) */
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 307d2b93e33..947e495aa20 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -109,3 +109,6 @@ Boston, MA 02111-1307, USA.  */
 #include <asld.h>
 #define EXEC_MAGIC AOUT1MAGIC
 #define EXEC_PAGESIZE DATACLICK
+
+/* arch-tag: a08e7dea-d48e-44cc-b60d-c7f2e5187ff5
+   (do not change this comment) */
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 3d54366aa94..fbd7e032a38 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -107,3 +107,6 @@ Boston, MA 02111-1307, USA.  */
 /* The OS needs stream.h+ptem.h included in sysdep.c.  */
 #define NO_SIOCTL_H
 #define NEED_PTEM_H
+
+/* arch-tag: 3dff1355-7cb6-49e3-8834-85a369e4ea8f
+   (do not change this comment) */
diff --git a/src/m/ustation.h b/src/m/ustation.h
index 17d59df0d02..b03a3555352 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -126,3 +126,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define BROKEN_SIGIO
 #define BROKEN_SIGTSTP
+
+/* arch-tag: 797f1d3e-3077-4eee-a81b-03fcf3a988fe
+   (do not change this comment) */
diff --git a/src/m/vax.h b/src/m/vax.h
index eace9f7e144..2e9d4738b64 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -113,3 +113,6 @@ NOTE-END  */
 #ifdef BSD4_2
 #define HAVE_FTIME
 #endif
+
+/* arch-tag: 508bdf7a-01a0-4ce0-8eba-0704d0df55a0
+   (do not change this comment) */
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 0a9596cd15c..bca10df352d 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -131,3 +131,6 @@ Boston, MA 02111-1307, USA.  */
 #undef TERMINFO
 #define LIBS_TERMCAP select.o -ltermlib
 #endif
+
+/* arch-tag: b181c512-0275-4d25-9bbc-be0c8ca7bcad
+   (do not change this comment) */
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 4188a7032ec..701e6e21e1b 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -119,3 +119,6 @@ Boston, MA 02111-1307, USA.  */
    If you've just fixed a problem in an existing configuration file,
    you should also check `etc/MACHINES' to make sure its descriptions
    of known problems in that configuration should be updated.  */
+
+/* arch-tag: ed6dc0c1-5c01-49df-befd-c25dfadfb8cf
+   (do not change this comment) */
diff --git a/src/m/xps100.h b/src/m/xps100.h
index 26cec523741..617b0a9c1d7 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -92,3 +92,6 @@ Boston, MA 02111-1307, USA.  */
 #define LIB_STANDARD  -lc
 #define LD_SWITCH_MACHINE -X
 #define SECTION_ALIGNMENT (0x3ff)
+
+/* arch-tag: 42316eb5-74b2-4762-970a-e372c6a2783d
+   (do not change this comment) */