diff --git a/.gitignore b/.gitignore
index 23a5179e8..94e36205a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@
 /include/
 /templates/
 /configure/*.local
-/configure/os/CONFIG_TOOLCHAIN.*
 /modules/RELEASE.*.local
 /modules/Makefile.local
 O.*/
diff --git a/configure/CONFIG b/configure/CONFIG
index 320ee8200..1c1242858 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -62,6 +62,9 @@ include $(CONFIG)/os/CONFIG.$(EPICS_HOST_ARCH).Common
 RELEASE_TOPS := $(shell $(CONVERTRELEASE) -T $(TOP) releaseTops)
 
 ifdef T_A
+  # Information from the target's compiler
+  #
+  -include $(EPICS_BASE)/cfg/TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
 
   #  Cross compile specific definitions
   #
@@ -71,7 +74,6 @@ ifdef T_A
 
   #  Target architecture specific definitions
   #
-  -include $(CONFIG)/os/CONFIG_TOOLCHAIN.Common.$(T_A)
   -include $(CONFIG)/os/CONFIG.Common.$(T_A)
 
   #  Host-Target architecture specific definitions
diff --git a/configure/Makefile b/configure/Makefile
index 157dde0ea..ba77d5089 100644
--- a/configure/Makefile
+++ b/configure/Makefile
@@ -30,23 +30,9 @@ CFG += CONFIG_CA_VERSION
 CFG += CONFIG_DATABASE_MODULE
 CFG += CONFIG_DATABASE_VERSION
 
+CFG += TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
+
 include $(TOP)/configure/RULES
 
-ifdef T_A
-
-install: $(TOP)/configure/os/CONFIG_TOOLCHAIN.Common.$(T_A)
-
-$(TOP)/configure/os/CONFIG_TOOLCHAIN.Common.$(T_A): toolchain.c
+TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A): toolchain.c
 	$(PREPROCESS.cpp)
-
-else
-
-realclean: clean_toolchain
-clean: clean_toolchain
-
-clean_toolchain:
-	$(RM) $(wildcard os/CONFIG_TOOLCHAIN.Common.*)
-
-.PHONY: clean_toolchain
-
-endif # T_A
diff --git a/configure/toolchain.c b/configure/toolchain.c
index c19d1049d..3120d4fdc 100644
--- a/configure/toolchain.c
+++ b/configure/toolchain.c
@@ -1,7 +1,7 @@
 #ifdef _COMMENT_
 /* Extract compiler pre-defined macros as Make variables
  *
- * Expanded as configure/os/CONFIG_TOOLCHAIN.Common.$(T_A)
+ * Expanded as $(INSTALL_CFG)/TOOLCHAIN.$(EPICS_HOST_ARCH).$(T_A)
  *
  * Must be careful not to #include any C definitions
  * into what is really a Makefile snippet