diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE
index f29f21141..03ec6d114 100644
--- a/configure/CONFIG_SITE
+++ b/configure/CONFIG_SITE
@@ -17,9 +17,8 @@
 #  Currently Supporting:
 #	cygwin-x86             (cygwin compiler used for host builds)
 #	cygwin-x86_64          (cygwin compiler used for host builds)
-#	darwin-ppc             (PowerPC based Apple running OSX)
-#	darwin-ppcx86          (Universal binaries for both CPUs)
-#	darwin-x86             (Intel based Apple running OSX)
+#	darwin-aarch64         (M1 based Apple using CLANG compiler)
+#	darwin-x86             (Intel based Apple using CLANG compiler)
 #	freebsd-x86            (GNU compiler used for host builds)
 #	freebsd-x86_64         (GNU compiler used for host builds)
 #	linux-aarch64          (GNU compiler used for host builds)
@@ -62,16 +61,8 @@
 
 #       ios-arm                 (darwin-x86 host)
 #       ios-386                 (darwin-x86 host)
-#       linux-386               (linux-x86 host)
-#       linux-486               (linux-x86 host)
-#       linux-586               (linux-x86 host)
-#       linux-686               (linux-x86 host)
 #       linux-arm               (linux-x86 or -x86_64 host)
 #       linux-aarch64           (linux-x86_64 host)
-#       linux-athlon            (linux-x86 host)
-#       linux-cris              (Axis GNU crosscompiler on linux-x86 host)
-#       linux-cris_v10          (Axis GNU crosscompiler on linux-x86 host)
-#       linux-cris_v32          (Axis GNU crosscompiler on linux-x86 host)
 #       linux-microblaze
 #       linux-xscale_be
 #       vxWorks-486
@@ -85,23 +76,20 @@
 #       vxWorks-ppc604_altivec
 #       vxWorks-mpc8540
 #       vxWorks-mpc8548
-#       RTEMS-at91rm9200ek
 #       RTEMS-beagleboneblack
 #       RTEMS-beatnik
-#       RTEMS-gen68360
-#       RTEMS-mcp750
-#       RTEMS-mvme167
 #       RTEMS-mvme2100
 #       RTEMS-mvme2700
 #       RTEMS-mvme3100
 #       RTEMS-mvme5500
-#       RTEMS-pc386
-#	RTEMS-pc686
-#       RTEMS-psim
-#	RTEMS-qoriq_e500
+#       RTEMS-pc386             (RTEMS 4)
+#       RTEMS-pc386-qemu        (RTEMS 4)
+#       RTEMS-pc686             (RTEMS 5)
+#       RTEMS-pc686-qemu        (RTEMS 5)
+#       RTEMS-qoriq_e500
 #       RTEMS-uC5282
-#	RTEMS-xilinx-zynq_a9_qemu
-#	RTEMS-xilinx_zynq_zedboad
+#       RTEMS-xilinx-zynq-a9_qemu
+#       RTEMS-xilinx_zynq_zedboard
 #       win32-x86-mingw         (linux-x86 or -x86_64 host)
 #
 
diff --git a/configure/os/CONFIG.Common.RTEMS-at91rm9200ek b/configure/os/CONFIG.Common.RTEMS-at91rm9200ek
deleted file mode 100644
index 735c07bb5..000000000
--- a/configure/os/CONFIG.Common.RTEMS-at91rm9200ek
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# CONFIG.Common.RTEMS-at91rm9200ek
-# Author: Ralf Hartmann
-#         BESSY
-#         Ralf.Hartmann@bessy.de
-#
-# Atmel AT91RM9200-EK evaluation kit
-# using the AT91RM9200 ARM9-based 32-bit RISC microcontroller
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = at91rm9200ek
-RTEMS_TARGET_CPU = arm
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-gen68360 b/configure/os/CONFIG.Common.RTEMS-gen68360
deleted file mode 100644
index 0a8a6e85e..000000000
--- a/configure/os/CONFIG.Common.RTEMS-gen68360
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = gen68360
-RTEMS_TARGET_CPU = m68k
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-mcp750 b/configure/os/CONFIG.Common.RTEMS-mcp750
deleted file mode 100644
index 035e6eb36..000000000
--- a/configure/os/CONFIG.Common.RTEMS-mcp750
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = mcp750
-RTEMS_TARGET_CPU = ppc
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-mvme167 b/configure/os/CONFIG.Common.RTEMS-mvme167
deleted file mode 100644
index 3651f966f..000000000
--- a/configure/os/CONFIG.Common.RTEMS-mvme167
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         Canadian Light Source
-#         eric@cls.usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = mvme167
-RTEMS_TARGET_CPU = m68k
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.RTEMS-psim b/configure/os/CONFIG.Common.RTEMS-psim
deleted file mode 100644
index 58ad72852..000000000
--- a/configure/os/CONFIG.Common.RTEMS-psim
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Author: W. Eric Norum
-#         University of Saskatchewan
-#         eric.norum@usask.ca
-#
-# All RTEMS targets use the same Makefile fragment
-#
-RTEMS_BSP = psim
-RTEMS_TARGET_CPU = ppc
-include $(CONFIG)/os/CONFIG.Common.RTEMS
diff --git a/configure/os/CONFIG.Common.darwin-ppc b/configure/os/CONFIG.Common.darwin-ppc
deleted file mode 100644
index 7ac704314..000000000
--- a/configure/os/CONFIG.Common.darwin-ppc
+++ /dev/null
@@ -1,14 +0,0 @@
-# CONFIG.Common.darwin-ppc
-#
-# This file is maintained by the build community.
-#
-# Definitions for darwin-ppc target builds
-# Sites may override these definitions in CONFIG_SITE.Common.darwin-ppc
-#-------------------------------------------------------
-
-#
-# To build universal binaries, configure ARCH_CLASS
-# in the file CONFIG_SITE.Common.darwin-ppc
-
-# Include definitions common to all Darwin targets
-include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon
diff --git a/configure/os/CONFIG.Common.darwin-ppcx86 b/configure/os/CONFIG.Common.darwin-ppcx86
deleted file mode 100644
index 12107944f..000000000
--- a/configure/os/CONFIG.Common.darwin-ppcx86
+++ /dev/null
@@ -1,14 +0,0 @@
-# CONFIG.Common.darwin-ppcx86
-#
-# This file is maintained by the build community.
-#
-# Definitions for Darwin universal PowerPC + x86 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.darwin-ppcx86
-#-------------------------------------------------------
-
-#
-# To build universal binaries, configure ARCH_CLASS
-# in the file CONFIG_SITE.Common.darwin-ppcx86
-
-# Include definitions common to all Darwin targets
-include $(CONFIG)/os/CONFIG.darwinCommon.darwinCommon
diff --git a/configure/os/CONFIG.Common.linux-386 b/configure/os/CONFIG.Common.linux-386
deleted file mode 100644
index a224ff328..000000000
--- a/configure/os/CONFIG.Common.linux-386
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG.Common.linux-386
-#
-# This file is maintained by the build community.
-#
-# Definitions for linux-386 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-386
-#-------------------------------------------------------
-
-# Include definitions common to all linux x86 targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-ARCH_DEP_CFLAGS = -march=i386
-
-ifeq ($(BUILD_CLASS),CROSS)
-  VALID_BUILDS = Ioc Command
-endif
-
-# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
-# e.g. i386-pc-linux-gnu-gcc, put a GNU_TARGET definition in
-# CONFIG_SITE.<host>.linux-386 file, e.g. GNU_TARGET=i386-pc-linux-gnu
-
diff --git a/configure/os/CONFIG.Common.linux-486 b/configure/os/CONFIG.Common.linux-486
deleted file mode 100644
index 79b533015..000000000
--- a/configure/os/CONFIG.Common.linux-486
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG.Common.linux-486
-#
-# Definitions for linux-486 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-486
-#-------------------------------------------------------
-
-# Include definitions common to all linux x86 targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-ARCH_DEP_CFLAGS = -march=i486
-
-ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
-endif
-
-# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
-# e.g. i486-pc-linux-gnu-gcc, put a GNU_TARGET definition in
-# CONFIG_SITE.<host>.linux-486 file, e.g. GNU_TARGET=i486-pc-linux-gnu
-
diff --git a/configure/os/CONFIG.Common.linux-586 b/configure/os/CONFIG.Common.linux-586
deleted file mode 100644
index b2b3b9b5c..000000000
--- a/configure/os/CONFIG.Common.linux-586
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG.Common.linux-586
-#
-# Definitions for linux-586 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-586
-#-------------------------------------------------------
-
-# Include definitions common to all linux x86 targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-# i586 is equivalent to pentium
-ARCH_DEP_CFLAGS = -march=i586
-
-ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
-endif
-
-# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
-# e.g. i586-pc-linux-gnu-gcc, put a GNU_TARGET definition in
-# CONFIG_SITE.<host>.linux-586 file, e.g. GNU_TARGET=i586-pc-linux-gnu
-
-
diff --git a/configure/os/CONFIG.Common.linux-686 b/configure/os/CONFIG.Common.linux-686
deleted file mode 100644
index a327d7e43..000000000
--- a/configure/os/CONFIG.Common.linux-686
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG.Common.linux-686
-#
-# Definitions for linux-686 target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-686
-#-------------------------------------------------------
-
-# Include definitions common to all linux x86 targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-# i686 is euivalent to pentiumpro
-ARCH_DEP_CFLAGS = -march=i686
-
-ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
-endif
-
-# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
-# e.g. i686-pc-linux-gnu-gcc, put a GNU_TARGET definition in
-# CONFIG_SITE.<host>.linux-686 file, e.g. GNU_TARGET=i686-pc-linux-gnu
-
diff --git a/configure/os/CONFIG.Common.linux-athlon b/configure/os/CONFIG.Common.linux-athlon
deleted file mode 100644
index a773a4996..000000000
--- a/configure/os/CONFIG.Common.linux-athlon
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG.Common.linux-athlon
-#
-# Definitions for linux-athlon target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-athlon
-#-------------------------------------------------------
-
-# Include definitions common to all linux x86 targets
-include $(CONFIG)/os/CONFIG.Common.linux-x86
-
-ARCH_DEP_CFLAGS += -march=athlon-mp -mfpmath=sse
-
-ifeq ($(BUILD_CLASS),CROSS)
-   VALID_BUILDS = Ioc Command
-endif
-
-# If your crosscompiler name has a GNU target prefix like <gnutarget>-gcc,
-# e.g. athlon-pc-linux-gnu-gcc, put a GNU_TARGET definition in
-# CONFIG_SITE.<host>.linux-athlon file, e.g. GNU_TARGET=athlon-pc-linux-gnu
-
diff --git a/configure/os/CONFIG.Common.linux-cris b/configure/os/CONFIG.Common.linux-cris
deleted file mode 100644
index d419b23e8..000000000
--- a/configure/os/CONFIG.Common.linux-cris
+++ /dev/null
@@ -1,58 +0,0 @@
-# CONFIG.Common.linux-cris
-#
-# Author: Peter Zumbruch
-#         GSI
-#         P.Zumbruch@gsi.de
-#
-# Definitions for linux-cris target builds
-# Sites may override these definitions in CONFIG_SITE.Common.linux-cris
-#-------------------------------------------------------
-
-# Include definitions common to all linux targets
-include $(CONFIG)/os/CONFIG.Common.linuxCommon
-
-ARCH_CLASS = cris
-
-ifeq ($(BUILD_CLASS),CROSS)
-    GNU_TARGET = cris-axis-linux-gnu
-    
-    # prefix of compiler tools
-    CMPLR_SUFFIX =
-    CMPLR_PREFIX = $(addsuffix -,$(GNU_TARGET))
-        
-    # CROSS_TOP_DIR
-    #    usually AXIS_TOP_DIR is defined via 
-    #    the init_env script of the SDK provided by Axis
-    #
-    ## AXIS_TOP_DIR defined? Make missing mandatory variable visible
-    AXIS_TOP_DIR?=UNDEFINED_ENV__AXIS_TOP_DIR
-    AXIS_SDK_DIR?=$(AXIS_TOP_DIR)
-    
-    # CROSS_INCLUDES 
-    AXIS_SDK_TARGET_INCLUDE_DIR = $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/include 
-    AXIS_SDK_TARGET_INCLUDE_DIR +=$(AXIS_SDK_DIR)/target/$(GNU_TARGET)/usr/include
-   
-    CROSS_INCLUDES = $(addprefix -isystem ,$(AXIS_SDK_TARGET_INCLUDE_DIR))
-
-    # CROSS_LDFLAGS 
-    AXIS_SDK_TARGET_LIB_DIR =  $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/lib
-    AXIS_SDK_TARGET_LIB_DIR += $(AXIS_SDK_DIR)/target/$(GNU_TARGET)/usr/lib
-   
-    CROSS_LDFLAGS = $(addprefix -L,$(AXIS_SDK_TARGET_LIB_DIR))
-
--include $(CONFIG)/os/CONFIG_SITE.Common.linux-cris
-ifeq ($(EPICS_HOST_ARCH), linux-x86)
--include $(CONFIG)/os/CONFIG.linux-x86.linux-cris
--include $(CONFIG)/os/CONFIG_SITE.linux-x86.linux-cris
-endif
-endif
-
-SHARED_LIBRARIES=NO
-STATIC_BUILD=YES
-
-ARCH_DEP_CFLAGS += -mno-mul-bug-workaround
-OP_SYS_CFLAGS += -mlinux
-ARCH_DEP_CPPFLAGS += -D_cris_ -mlinux
-
-#uncomment CRIS_COMPILER_DEBUG for debugging cris-compiled code
-#CRIS_COMPILER_DEBUG
diff --git a/configure/os/CONFIG.darwin-ppc.Common b/configure/os/CONFIG.darwin-ppc.Common
deleted file mode 100644
index ac176878f..000000000
--- a/configure/os/CONFIG.darwin-ppc.Common
+++ /dev/null
@@ -1,8 +0,0 @@
-# CONFIG.darwin-ppc.Common
-#
-# Definitions for darwin-ppc host builds
-# Sites may override these definitions in CONFIG_SITE.darwin-ppc.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
diff --git a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug b/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug
deleted file mode 100644
index 985052031..000000000
--- a/configure/os/CONFIG.darwin-ppc.darwin-ppc-debug
+++ /dev/null
@@ -1,13 +0,0 @@
-# CONFIG.darwin-ppc.darwin-ppc-debug
-#
-# Definitions for darwin-ppc host - darwin-ppc-debug target build with debug compiler flags
-# Sites may override these definitions in CONFIG_SITE.darwin-ppc.darwin-ppc-debug
-#-------------------------------------------------------
-
--include $(CONFIG)/os/CONFIG.Common.darwin-ppc
--include $(CONFIG)/os/CONFIG.darwin-ppc.darwin-ppc
--include $(CONFIG)/os/CONFIG_SITE.Common.darwin-ppc
--include $(CONFIG)/os/CONFIG_SITE.darwin-ppc.darwin-ppc
-
-BUILD_CLASS=HOST
-HOST_OPT = NO
diff --git a/configure/os/CONFIG.darwin-ppcx86.Common b/configure/os/CONFIG.darwin-ppcx86.Common
deleted file mode 100644
index 749835ced..000000000
--- a/configure/os/CONFIG.darwin-ppcx86.Common
+++ /dev/null
@@ -1,8 +0,0 @@
-# CONFIG.darwin-ppcx86.Common
-#
-# Definitions for Darwin universal PowerPC + x86 host builds
-# Sites may override these definitions in CONFIG_SITE.darwin-ppcx86.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
diff --git a/configure/os/CONFIG.linux-386.Common b/configure/os/CONFIG.linux-386.Common
deleted file mode 100644
index 9a3633bdf..000000000
--- a/configure/os/CONFIG.linux-386.Common
+++ /dev/null
@@ -1,10 +0,0 @@
-# CONFIG.linux-386.Common
-#
-# Definitions for linux-386 host builds
-# Sites may override these definitions in CONFIG_SITE.linux-386.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = x86-linux2
diff --git a/configure/os/CONFIG.linux-386.linux-386 b/configure/os/CONFIG.linux-386.linux-386
deleted file mode 100644
index f65ac46b7..000000000
--- a/configure/os/CONFIG.linux-386.linux-386
+++ /dev/null
@@ -1,8 +0,0 @@
-#  CONFIG.linux-386.linux-386
-#
-# Definitions for linux-386 host - linux-386 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-386.linux-386
-#-------------------------------------------------------
-
-# Include linux-x86 compiler definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
diff --git a/configure/os/CONFIG.linux-486.Common b/configure/os/CONFIG.linux-486.Common
deleted file mode 100644
index c151b3218..000000000
--- a/configure/os/CONFIG.linux-486.Common
+++ /dev/null
@@ -1,10 +0,0 @@
-# CONFIG.linux-486.Common
-#
-# Definitions for linux-486 host builds
-# Sites may override these definitions in CONFIG_SITE.linux-486.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = x86-linux2
diff --git a/configure/os/CONFIG.linux-486.linux-486 b/configure/os/CONFIG.linux-486.linux-486
deleted file mode 100644
index 551cacc29..000000000
--- a/configure/os/CONFIG.linux-486.linux-486
+++ /dev/null
@@ -1,9 +0,0 @@
-#  CONFIG.linux-486.linux-486
-#
-# Definitions for linux-486 host - linux-486 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-486.linux-486
-#-------------------------------------------------------
-
-# Include linux-x86 compiler definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
diff --git a/configure/os/CONFIG.linux-586.Common b/configure/os/CONFIG.linux-586.Common
deleted file mode 100644
index 43463e8a0..000000000
--- a/configure/os/CONFIG.linux-586.Common
+++ /dev/null
@@ -1,10 +0,0 @@
-# CONFIG.linux-586.Common
-#
-# Definitions for linux-586 host builds
-# Sites may override these definitions in CONFIG_SITE.linux-586.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = x86-linux2
diff --git a/configure/os/CONFIG.linux-586.linux-586 b/configure/os/CONFIG.linux-586.linux-586
deleted file mode 100644
index 990bfad74..000000000
--- a/configure/os/CONFIG.linux-586.linux-586
+++ /dev/null
@@ -1,9 +0,0 @@
-#  CONFIG.linux-586.linux-586
-#
-# Definitions for linux-586 host - linux-586 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-586.linux-586
-#-------------------------------------------------------
-
-# Include linux-x86 compiler definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
diff --git a/configure/os/CONFIG.linux-686.Common b/configure/os/CONFIG.linux-686.Common
deleted file mode 100644
index f36cddeac..000000000
--- a/configure/os/CONFIG.linux-686.Common
+++ /dev/null
@@ -1,10 +0,0 @@
-# CONFIG.linux-686.Common
-#
-# Definitions for linux-686 host builds
-# Sites may override these definitions in CONFIG_SITE.linux-686.Common
-#-------------------------------------------------------
-
-#Include definitions common to unix hosts
-include $(CONFIG)/os/CONFIG.UnixCommon.Common
-
-WIND_HOST_TYPE = x86-linux2
diff --git a/configure/os/CONFIG.linux-686.linux-686 b/configure/os/CONFIG.linux-686.linux-686
deleted file mode 100644
index e4195a40a..000000000
--- a/configure/os/CONFIG.linux-686.linux-686
+++ /dev/null
@@ -1,9 +0,0 @@
-#  CONFIG.linux-686.linux-686
-#
-# Definitions for linux-686 host - linux-686 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-686.linux-686
-#-------------------------------------------------------
-
-# Include linux-x86 compiler definitions
-include $(CONFIG)/os/CONFIG.linux-x86.linux-x86
-
diff --git a/configure/os/CONFIG.linux-x86.linux-cris b/configure/os/CONFIG.linux-x86.linux-cris
deleted file mode 100644
index 8244916e5..000000000
--- a/configure/os/CONFIG.linux-x86.linux-cris
+++ /dev/null
@@ -1,38 +0,0 @@
-# CONFIG.linux-x86.linux-cris
-#
-# Author: Peter Zumbruch
-#         GSI
-#         P.Zumbruch@gsi.de
-#
-# Definitions for linux-x86 host - linux-cris target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-cris
-#-------------------------------------------------------
-
-GNU_DIR = $(CRIS_CROSS_COMPILER)
-
-#STATIC_...
-STATIC_LDFLAGS_YES= -Wl,-Bstatic
-
-## debian-gcc Bug#438641
-GNU_LDLIBS_YES =
-STATIC_LDFLAGS_YES += -static-libgcc
-
-# if not in debug mode strip all symbols
-ifndef CRIS_COMPILER_DEBUG
-STATIC_LDFLAGS_YES += -Wl,--strip-all
-endif
-
-ifeq ($(GNU),YES)
-STATIC_LDFLAGS_NO = -lgcc
-else
-STATIC_LDFLAGS_NO =
-endif
-
-STATIC_LDLIBS_YES=
-STATIC_LDLIBS_NO=
-
-OPT_CXXFLAGS_YES = -Os
-
-ifeq ($(STATIC_BUILD), YES)
-   $(shell echo yes)
-endif
diff --git a/configure/os/CONFIG.linux-x86.linux-cris_v10 b/configure/os/CONFIG.linux-x86.linux-cris_v10
deleted file mode 100644
index a227ac07c..000000000
--- a/configure/os/CONFIG.linux-x86.linux-cris_v10
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG.linux-x86.linux-cris_v10
-#
-# Author: Peter Zumbruch
-#         GSI
-#         P.Zumbruch@gsi.de
-#
-# Definitions for linux-x86 host - linux-cris_v10 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-cris_v10
-#-------------------------------------------------------
-
-# Include definitions common to all linux-cris targets
-include $(CONFIG)/os/CONFIG.Common.linux-cris
-
-GNU_TARGET = cris-axis-linux-gnu
-
-ARCH_DEP_CFLAGS += -march=v10
-
-# if you are using different places for cris_v10 cris_v32
-# you have to define for each architecture
-# AXIS_SDK_DIR=<AXIS_TOP_DIR_v10>
diff --git a/configure/os/CONFIG.linux-x86.linux-cris_v32 b/configure/os/CONFIG.linux-x86.linux-cris_v32
deleted file mode 100644
index eee8f3344..000000000
--- a/configure/os/CONFIG.linux-x86.linux-cris_v32
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG.linux-x86.linux-cris_v32
-#
-# Author: Peter Zumbruch
-#         GSI
-#         P.Zumbruch@gsi.de
-#
-# Definitions for linux-x86 host - linux-cris_v32 target builds
-# Sites may override these definitions in CONFIG_SITE.linux-x86.linux-cris_v32
-#-------------------------------------------------------
-
-# Include definitions common to all linux-cris targets
-include $(CONFIG)/os/CONFIG.Common.linux-cris
-
-GNU_TARGET = crisv32-axis-linux-gnu
-
-ARCH_DEP_CFLAGS += -march=v32
-
-# if you are using different places for cris_v10 cris_v32
-# you have to define for each architecture
-# AXIS_SDK_DIR=<AXIS_TOP_DIR_v32>
diff --git a/configure/os/CONFIG_SITE.Common.darwin-ppc b/configure/os/CONFIG_SITE.Common.darwin-ppc
deleted file mode 100644
index a2550147f..000000000
--- a/configure/os/CONFIG_SITE.Common.darwin-ppc
+++ /dev/null
@@ -1,12 +0,0 @@
-# CONFIG_SITE.Common.darwin-ppc
-#
-# Site override definitions for darwin-ppc target builds
-#-------------------------------------------------------
-
-# Select which CPU architectures to include in your universal binaries:
-#   ppc
-#   ppc64   - Not tested
-
-ARCH_CLASS = ppc
-#ARCH_CLASS = ppc64
-#ARCH_CLASS = ppc ppc64
diff --git a/configure/os/CONFIG_SITE.Common.darwin-ppcx86 b/configure/os/CONFIG_SITE.Common.darwin-ppcx86
deleted file mode 100644
index 2191d54f8..000000000
--- a/configure/os/CONFIG_SITE.Common.darwin-ppcx86
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG_SITE.Common.darwin-ppcx86
-#
-# Site override definitions for darwin-ppcx86 target builds
-#----------------------------------------------------------
-
-# Select which CPU architectures to include in your universal binaries:
-#   ppc
-#   i386
-#   ppc64   - Not tested
-#   x86_64  - Needs MacOS 10.4 with Universal SDK, or 10.5 or later.
-
-ARCH_CLASS = ppc i386
-#ARCH_CLASS = ppc x86_64
-#ARCH_CLASS = ppc i386 x86_64
-#ARCH_CLASS = ppc64 i386
-#ARCH_CLASS = ppc64 x86_64
-#ARCH_CLASS = ppc64 i386 x86_64
-#ARCH_CLASS = ppc ppc64 i386
-#ARCH_CLASS = ppc ppc64 x86_64
-#ARCH_CLASS = ppc ppc64 i386 x86_64
diff --git a/configure/os/CONFIG_SITE.Common.darwin-x86 b/configure/os/CONFIG_SITE.Common.darwin-x86
index 1c5c93696..e837d63f0 100644
--- a/configure/os/CONFIG_SITE.Common.darwin-x86
+++ b/configure/os/CONFIG_SITE.Common.darwin-x86
@@ -4,14 +4,12 @@
 #-------------------------------------------------------
 
 # Select which CPU architecture(s) to include in your MacOS binaries:
-#   i386, x86_64, or both (fat binaries).
+#   x86_64 only, or arm64 as well (fat binaries).
 
-#ARCH_CLASS = i386
 ARCH_CLASS = x86_64
-#ARCH_CLASS = i386 x86_64
+#ARCH_CLASS = arm64 x86_64
 
-#
-# Uncomment the following 3 lines to build with Apple's GCC instead of CLANG.
+# Uncomment the following 3 lines to build with GCC instead of CLANG.
 #
 #CMPLR_CLASS = gcc
 #CC  = gcc
diff --git a/configure/os/CONFIG_SITE.Common.linux-cris b/configure/os/CONFIG_SITE.Common.linux-cris
deleted file mode 100644
index 699f346ff..000000000
--- a/configure/os/CONFIG_SITE.Common.linux-cris
+++ /dev/null
@@ -1,34 +0,0 @@
-# CONFIG_SITE.Common.linux-cris
-#
-# Site-specific settings for the linux-cris target
-
-# NOTE: In most cases if SHARED_LIBRARIES is set to YES the
-# shared libraries will be found automatically.  However if the .so
-# files are installed at a different path to their compile-time path
-# then in order to be found at runtime do one of these:
-# a) LD_LIBRARY_PATH must include the full absolute pathname to
-#    $(INSTALL_LOCATION)/lib/$(EPICS_HOST_ARCH) when invoking base
-#    executables.
-# b) Add the runtime path to SHRLIB_DEPLIB_DIRS and PROD_DEPLIB_DIRS, which
-#    will add the named directory to the list contained in the executables.
-# c) Add the runtime path to /etc/ld.so.conf and run ldconfig
-#    to inform the system of the shared library location.
-
-
-# Use GNU Readline if the header file is installed
-COMMANDLINE_LIBRARY = $(strip $(if $(wildcard \
-    $(GNU_DIR)/include/readline/readline.h), READLINE, EPICS))
-
-# If libreadline needs additional libraries to be linked with it, try
-# uncommenting each of the lines below in turn, starting with the top
-# one and working downwards, until the build succeeds. Do a 'make rebuild'
-# from the top of the Base tree after changing this setting.
-
-# Needs -lncurses:
-#COMMANDLINE_LIBRARY = READLINE_NCURSES
-
-# Needs -lcurses:
-#COMMANDLINE_LIBRARY = READLINE_CURSES
-
-# Readline is broken or you don't want use it:
-#COMMANDLINE_LIBRARY = EPICS
diff --git a/configure/os/CONFIG_SITE.darwin-ppc.Common b/configure/os/CONFIG_SITE.darwin-ppc.Common
deleted file mode 100644
index 05417e1f9..000000000
--- a/configure/os/CONFIG_SITE.darwin-ppc.Common
+++ /dev/null
@@ -1,4 +0,0 @@
-# CONFIG_SITE.darwin-ppc.Common
-#
-# Site override definitions for darwin-ppc host builds
-#-------------------------------------------------------
diff --git a/configure/os/CONFIG_SITE.darwin-ppcx86.Common b/configure/os/CONFIG_SITE.darwin-ppcx86.Common
deleted file mode 100644
index 42bd00531..000000000
--- a/configure/os/CONFIG_SITE.darwin-ppcx86.Common
+++ /dev/null
@@ -1,4 +0,0 @@
-# CONFIG_SITE.darwin-ppcx86.Common
-#
-# Site override definitions for darwin-ppcx86 host builds
-#-------------------------------------------------------
diff --git a/configure/os/CONFIG_SITE.linux-x86.Common b/configure/os/CONFIG_SITE.linux-x86.Common
index dc29e8f0d..afb74e914 100644
--- a/configure/os/CONFIG_SITE.linux-x86.Common
+++ b/configure/os/CONFIG_SITE.linux-x86.Common
@@ -3,7 +3,5 @@
 # Site override definitions for linux-x86 host builds
 #-------------------------------------------------------
 
-# JBA test override values
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040 solaris-sparc
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386 # RTEMS-mvme5500 RTEMS-mvme167
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32
+#CROSS_COMPILER_TARGET_ARCHS = RTEMS-mvme2100 RTEMS-pc386-qemu
diff --git a/configure/os/CONFIG_SITE.linux-x86.linux-cris b/configure/os/CONFIG_SITE.linux-x86.linux-cris
deleted file mode 100644
index eb756ca8a..000000000
--- a/configure/os/CONFIG_SITE.linux-x86.linux-cris
+++ /dev/null
@@ -1,14 +0,0 @@
-# CONFIG_SITE.linux-x86.linux-cris
-#
-# Author: Peter Zumbruch
-#         GSI
-#         P.Zumbruch@gsi.de
-#
-# Site specific definitions for linux-x86 host - linux-cris target builds
-#-------------------------------------------------------
-
-# define site specific location of cris cross compiler's gnu directory
-# but without bin sub directory, this will be added automatically.
-
-CRIS_CROSS_COMPILER ?= UNDEFINED_ENV__CRIS_CROSS_COMPILER
-
diff --git a/documentation/README.cris b/documentation/README.cris
deleted file mode 100644
index c44f31bb0..000000000
--- a/documentation/README.cris
+++ /dev/null
@@ -1,67 +0,0 @@
-cross compiling EPICS and
-   building IOC Applications for cris architectures
-      (linux-cris_v10, linux-cris_v32)
-======================================================================
-
-Please mail questions, comments, corrections, etc. ...
-to P.Zumbruch@gsi.de
-November 2007
-
-Tools needed
-------------
-
- o Axis SDK
-    - Overview:
-      http://developer.axis.com/wiki/doku.php?id=axis:sdk
-    - Download:
-      http://www.axis.com/products/dev_sdk/download_dist.php
-    - Install HOWTO:
-      http://developer.axis.com/wiki/doku.php?id=axis:software_distribution_install_howto
-  o Axis GNU gcc release for cross compiling
-    - Download:
-      http://www.axis.com/products/dev_sdk/download_compiler.php
-    - Install HOWTO:
-      http://developer.axis.com/wiki/doku.php?id=axis:compiler_install
-
-Environment
------------
-
- o CRIS_CROSS_COMPILER
-    - path to top directory of cris cross compiler,
-      where binaries are in sub directory bin/
-    - if not set, the make process will stop at place
-      UNDEFINED_ENV__CRIS_CROSS_COMPILER
- o AXIS_TOP_DIR?=UNDEFINED_ENV__AXIS_TOP_DIR
-    - path to axis SDK top directory
-    - if not set compile and link commands will contain references to
-      UNDEFINED_ENV__AXIS_TOP_DIR
-    - to set the necessary variables, execute
-      . ./init_env
-      in the top directory of the SDK provided here.
- o CRIS_COMPILER_DEBUG
-    - if defined symbols won't be stripped,
-      resulting in comparably large files
-
-Building
---------
-
- o Edit the CONFIG_SITE files
-    - CONFIG_SITE.linux-x86.Common:
-       for CROSS_COMPILER_TARGET_ARCHS += linux-cris_v10
-       for CROSS_COMPILER_TARGET_ARCHS += linux-cris_v32
-    - optionally CONFIG_SITE.linux-x86.linux-cris
-       for setting CRIS_CROSS_COMPILER
-    - optionally create CONFIG_SITE.linux-x86.linux-cris_v10
-    - optionally create CONFIG_SITE.linux-x86.linux-cris_v32
- o "make".
-
-Shared Libraries
-----------------
-
-Generating shared libraries is not supported.
-
-
-Please feel free to contact me if you
-encounter serious problems.
-
-Peter
diff --git a/documentation/RELEASE_NOTES.md b/documentation/RELEASE_NOTES.md
index d932a0323..eaee85dbc 100644
--- a/documentation/RELEASE_NOTES.md
+++ b/documentation/RELEASE_NOTES.md
@@ -17,6 +17,16 @@ should also be read to understand what has changed since earlier releases.
 
 <!-- Insert new items immediately below here ... -->
 
+### Support for obsolete architectures removed
+
+These target architectures have been removed:
+
++ darwin-ppc, darwin-ppcx86
++ linux-386, linux-486, linux-586, linux-686, linux-athlon (cross-build)
++ linux-cris, linux-cris_v10, linux-cris_v32 (cross-build)
++ RTEMS-at91rm9200ek, RTEMS-gen68360, RTEMS-mcp750, RTEMS-mvme167,
+RTEMS-psim (cross-build)
+
 ### Experimental Support for RTEMS 5
 
 The new major release of the RTEMS real-time OS contains many changes
diff --git a/src/template/ext/top/configure/os/CONFIG.linux-x86.linux-386 b/src/template/ext/top/configure/os/CONFIG.linux-x86.linux-386
deleted file mode 100644
index ed73b3464..000000000
--- a/src/template/ext/top/configure/os/CONFIG.linux-x86.linux-386
+++ /dev/null
@@ -1,2 +0,0 @@
-
-include $(TOP)/configure/os/CONFIG_SITE.linux-x86.linux-x86
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common b/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
deleted file mode 100644
index 21363a633..000000000
--- a/src/template/ext/top/configure/os/CONFIG_SITE.Common.Common
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# java jdk definitions
-#CLASSPATH += -classpath .:..:$(INSTALL_JAVA):$(JAVA_DIR)/bin/../classes:$(JAVA_DIR)/bin/../lib/classes.zip
-#JAVACCMD = $(subst \,/,$(JAVA_DIR)/bin/javac$(EXE) $(CLASSPATH) $(JAVAC_FLAGS) )
-#JAVAHCMD = $(subst \,/,$(JAVA_DIR)/bin/javah$(EXE) -jni $(CLASSPATH) $(JAVAH_FLAGS))
-#JARCMD = $(subst \,/,$(JAVA_DIR)/bin/jar$(EXE) $(JAR_OPTIONS) $(MANIFEST) $(JAR) $(JAR_INPUT))
-
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
deleted file mode 100644
index 19d65aead..000000000
--- a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc-gnu.aix-ppc-gnu
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# Where to find utilities/libraries
-#       If you do not have a certain product,
-#       leave the line empty.
-#
-
--include $(TOP)/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
-
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc b/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
deleted file mode 100644
index 3f40e0b37..000000000
--- a/src/template/ext/top/configure/os/CONFIG_SITE.aix-ppc.aix-ppc
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# Where to find utilities/libraries
-#       If you do not have a certain product,
-#       leave the line empty.
-#
-
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
-
-# sun X11
-X11_LIB = /usr/openwin/lib
-X11_INC = /usr/openwin/include
-# mit X11
-#X11_LIB = /opt/X11R5/lib
-#X11_INC = /opt/X11R5/include
-# osf motif
-#MOTIF_INC = /opt/local/Motif2.0/include
-#MOTIF_LIB = /opt/local/Motif2.0/lib
-# sun SDK motif
-#MOTIF_INC = /opt/SUNWmotif/include
-#MOTIF_LIB = /opt/SUNWmotif/lib
-# sun 5.4,5.6 SDK motif
-MOTIF_INC = /usr/dt/include
-MOTIF_LIB = /usr/dt/lib
-OPENWIN = /usr/openwin
-
-INTERVIEWS_BIN=/usr/local/interviews/bin/O.solaris
-INTERVIEWS_LIB=/usr/local/interviews/lib/O.solaris
-IV_INC=/usr/local/interviews/include
-IV-2_6_INC=/usr/local/interviews/include/IV-2_6
-IV_BIN=/usr/local/interviews/bin/O.solaris
-IV_LIB=/usr/local/interviews/lib/O.solaris
-
-WINGZ_INC = /opt/local/Wingz2/incl
-WINGZ_LIB = /opt/local/Wingz2/lib
-#MATHEMATICA = /usr/local/math
-# Define XRTGRAPH_EXTENSIONS = YES only if using XRT/graph 3.x
-#   and you want the extensions for MEDM
-XRTGRAPH_EXTENSIONS = YES
-XRTGRAPH = /opt/local/xrtgraph
-QUESTWIN = /usr/local/questwin
-
-TK_LIB = /opt/local/lib
-TK_INC = /opt/local/include
-TCL_LIB = /opt/local/lib
-TCL_INC = /opt/local/include
-DP_LIB = /opt/local/lib
-DP_INC = /opt/local/include
-BLT_LIB = /opt/local/lib
-BLT_INC = /opt/local/include
-
-IDL = /usr/local/idl
-#  IDL=$(IDL)/external/rpc is the sun4 version
-IDLRPC = $(IDL)/external/rpc.solaris
-
-ZLIB_PREFIX = /usr/local/oag
-ZLIB = $(notdir $(wildcard $(ZLIB_PREFIX)/lib/libz.a))
-ifeq ($(ZLIB) , libz.a)
-ZLIB_LIB = $(ZLIB_PREFIX)/lib
-ZLIB_INC = -I$(ZLIB_PREFIX)/include
-ZLIB_CFLAG = -DzLib
-ZLIB_PROD_LIB = z
-z_DIR=$(ZLIB_PREFIX)/lib
-else
-ZLIB_LIB =
-ZLIB_INC =
-ZLIB_CFLAG =
-ZLIB_PROD_LIB =
-z_DIR=
-endif
-
-PYTHON_DIR=/opt/local/lib/python2.2
-PYTHON_INCLUDE=/opt/local/include/python2.2
-
-JAVA_DIR=/usr/java
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
index f1745159b..9dd907a24 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
@@ -7,7 +7,6 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
 -include $(TOP)/configure/os/CONFIG_SITE.win32-x86.win32-x86
 
 # ---------- java definitions
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
index 9e98c70ef..74f12920b 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.darwin-x86.darwin-x86
@@ -7,8 +7,6 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
-
 PYTHON_DIR=/usr/lib/python2.2
 PYTHON_INCLUDE=/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3
 
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
deleted file mode 100644
index 25036ccac..000000000
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-athlon
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# Where to find utilities/libraries
-#       If you do not have a certain product,
-#       leave the line empty.
-#
-
-
--include $(TOP)/configure/os/CONFIG_SITE.linux-x86.linux-x86
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
index 8641a9d27..e74accbf0 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.linux-x86.linux-x86
@@ -7,8 +7,6 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
-
 #X11_LIB=/usr/X11R6/lib
 #X11_INC=/usr/X11R6/include
 #MOTIF_LIB=/usr/X11R6/lib
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
index bd113bea3..db0622864 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.solaris-sparc.solaris-sparc
@@ -7,8 +7,6 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
-
 # sun X11
 X11_LIB = /usr/openwin/lib
 X11_INC = /usr/openwin/include
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
deleted file mode 100644
index f6ca56942..000000000
--- a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86-cygwin.win32-x86-cygwin
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# Site Specific Configuration Information
-# Only the local epics system manager should modify this file
-
-# Where to find utilities/libraries
-#       If you do not have a certain product,
-#       leave the line empty.
-#
-
--include $(TOP)/configure/os/CONFIG_SITE.cygwin-x86.cygwin-x86
-
diff --git a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86 b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
index 8118893a7..f2614098b 100644
--- a/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
+++ b/src/template/ext/top/configure/os/CONFIG_SITE.win32-x86.win32-x86
@@ -9,8 +9,6 @@
 #       leave the line empty.
 #
 
--include $(TOP)/configure/os/CONFIG_SITE.Common.Common
-
 # If objects were compiled with different default runtime libraries
 # (not a good idea), specify which one you want to use in the product
 # by making it the default and the others nodefault.  Use
diff --git a/src/tools/EpicsHostArch.pl b/src/tools/EpicsHostArch.pl
index 67e29c77e..abff49007 100644
--- a/src/tools/EpicsHostArch.pl
+++ b/src/tools/EpicsHostArch.pl
@@ -47,9 +47,8 @@ sub HostArch {
         my ($kernel, $hostname, $release, $version, $cpu) = uname;
         if (m/^darwin/) {
             for ($cpu) {
-                return 'darwin-x86'     if m/^(i386|x86_64)/;
-                return 'darwin-ppc'     if m/Power Macintosh/;
-                return 'darwin-aarch64' if m/arm64/;
+                return 'darwin-x86'     if m/^x86_64/;
+                return 'darwin-aarch64' if m/^arm64/;
             }
             die "$0: macOS CPU type '$cpu' not recognized\n";
         }