diff --git a/rtl/aix/Makefile b/rtl/aix/Makefile
index 51208d8795..9fa5a1d582 100644
--- a/rtl/aix/Makefile
+++ b/rtl/aix/Makefile
@@ -2423,8 +2423,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/amiga/Makefile b/rtl/amiga/Makefile
index 4526f25d6f..c99c9395c5 100644
--- a/rtl/amiga/Makefile
+++ b/rtl/amiga/Makefile
@@ -2455,8 +2455,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/android/Makefile b/rtl/android/Makefile
index 46bf72e988..b73c202fc7 100644
--- a/rtl/android/Makefile
+++ b/rtl/android/Makefile
@@ -2562,8 +2562,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/aros/Makefile b/rtl/aros/Makefile
index 75f656ed9b..6de4908804 100644
--- a/rtl/aros/Makefile
+++ b/rtl/aros/Makefile
@@ -2470,8 +2470,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/atari/Makefile b/rtl/atari/Makefile
index 9c947ba2d2..8a33fbfb5c 100644
--- a/rtl/atari/Makefile
+++ b/rtl/atari/Makefile
@@ -2425,8 +2425,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile
index e22048ae2c..a3dcb9de59 100644
--- a/rtl/beos/Makefile
+++ b/rtl/beos/Makefile
@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/darwin/Makefile b/rtl/darwin/Makefile
index 4379e8fd98..90584aa601 100644
--- a/rtl/darwin/Makefile
+++ b/rtl/darwin/Makefile
@@ -2551,8 +2551,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/dragonfly/Makefile b/rtl/dragonfly/Makefile
index 480ab859b3..fb6751f7f3 100644
--- a/rtl/dragonfly/Makefile
+++ b/rtl/dragonfly/Makefile
@@ -2432,8 +2432,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile
index 9fc2457e4c..2f45715d39 100644
--- a/rtl/embedded/Makefile
+++ b/rtl/embedded/Makefile
@@ -2789,8 +2789,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/emx/Makefile b/rtl/emx/Makefile
index defe376e38..f5fb789247 100644
--- a/rtl/emx/Makefile
+++ b/rtl/emx/Makefile
@@ -2431,8 +2431,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/freebsd/Makefile b/rtl/freebsd/Makefile
index fed49bd8e6..069626810b 100644
--- a/rtl/freebsd/Makefile
+++ b/rtl/freebsd/Makefile
@@ -2473,8 +2473,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index a8d953aefc..8185948bec 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -2620,8 +2620,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/gba/Makefile b/rtl/gba/Makefile
index 7ad05466bb..50577dbf49 100644
--- a/rtl/gba/Makefile
+++ b/rtl/gba/Makefile
@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile
index d6e1525b9b..9d68c81d97 100644
--- a/rtl/go32v2/Makefile
+++ b/rtl/go32v2/Makefile
@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/haiku/Makefile b/rtl/haiku/Makefile
index a9025a9828..5b3e0741b5 100644
--- a/rtl/haiku/Makefile
+++ b/rtl/haiku/Makefile
@@ -2464,8 +2464,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/java/Makefile b/rtl/java/Makefile
index fab630622c..85b52c6938 100644
--- a/rtl/java/Makefile
+++ b/rtl/java/Makefile
@@ -2394,8 +2394,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index 8d2164545f..2009d08c6f 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -3024,8 +3024,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/macos/Makefile b/rtl/macos/Makefile
index 7c835870bd..3bd15584cd 100644
--- a/rtl/macos/Makefile
+++ b/rtl/macos/Makefile
@@ -2413,8 +2413,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/morphos/Makefile b/rtl/morphos/Makefile
index 57d483366c..7f7690502c 100644
--- a/rtl/morphos/Makefile
+++ b/rtl/morphos/Makefile
@@ -2397,8 +2397,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/msdos/Makefile b/rtl/msdos/Makefile
index 1fee6526dc..dfa1106dd2 100644
--- a/rtl/msdos/Makefile
+++ b/rtl/msdos/Makefile
@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/msxdos/Makefile b/rtl/msxdos/Makefile
index 9feef1a00d..02ce6aa4f2 100644
--- a/rtl/msxdos/Makefile
+++ b/rtl/msxdos/Makefile
@@ -2394,8 +2394,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/nativent/Makefile b/rtl/nativent/Makefile
index 5dfad024fe..d63a68741f 100644
--- a/rtl/nativent/Makefile
+++ b/rtl/nativent/Makefile
@@ -2401,8 +2401,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/nds/Makefile b/rtl/nds/Makefile
index 592d39bac0..9175671daa 100644
--- a/rtl/nds/Makefile
+++ b/rtl/nds/Makefile
@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/netbsd/Makefile b/rtl/netbsd/Makefile
index 283d8d05cc..1142d52350 100644
--- a/rtl/netbsd/Makefile
+++ b/rtl/netbsd/Makefile
@@ -2529,8 +2529,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/netware/Makefile b/rtl/netware/Makefile
index 9d94463cf7..229d36a6d2 100644
--- a/rtl/netware/Makefile
+++ b/rtl/netware/Makefile
@@ -2435,8 +2435,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/netwlibc/Makefile b/rtl/netwlibc/Makefile
index 1f8f19b7d2..e565783a37 100644
--- a/rtl/netwlibc/Makefile
+++ b/rtl/netwlibc/Makefile
@@ -2426,8 +2426,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/openbsd/Makefile b/rtl/openbsd/Makefile
index 3b7a4194ef..249d7e3632 100644
--- a/rtl/openbsd/Makefile
+++ b/rtl/openbsd/Makefile
@@ -2462,8 +2462,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile
index c4085b8f7d..eb3b7084ef 100644
--- a/rtl/os2/Makefile
+++ b/rtl/os2/Makefile
@@ -2429,8 +2429,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/palmos/Makefile b/rtl/palmos/Makefile
index 8eb61e4f26..54bbe4ce53 100644
--- a/rtl/palmos/Makefile
+++ b/rtl/palmos/Makefile
@@ -2437,8 +2437,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/sinclairql/Makefile b/rtl/sinclairql/Makefile
index e45cca9a10..3ed0d8480b 100644
--- a/rtl/sinclairql/Makefile
+++ b/rtl/sinclairql/Makefile
@@ -2425,8 +2425,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/solaris/Makefile b/rtl/solaris/Makefile
index 6f6a3e306c..a69dad5797 100644
--- a/rtl/solaris/Makefile
+++ b/rtl/solaris/Makefile
@@ -2438,8 +2438,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/symbian/Makefile b/rtl/symbian/Makefile
index 4f03d3a892..065c09c516 100644
--- a/rtl/symbian/Makefile
+++ b/rtl/symbian/Makefile
@@ -2414,8 +2414,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile
index bf6f923935..82b37884f4 100644
--- a/rtl/wasi/Makefile
+++ b/rtl/wasi/Makefile
@@ -2399,8 +2399,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/watcom/Makefile b/rtl/watcom/Makefile
index 2b9d0e95c7..752af905d3 100644
--- a/rtl/watcom/Makefile
+++ b/rtl/watcom/Makefile
@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/wii/Makefile b/rtl/wii/Makefile
index 238c11bb78..4de318c396 100644
--- a/rtl/wii/Makefile
+++ b/rtl/wii/Makefile
@@ -2393,8 +2393,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/win16/Makefile b/rtl/win16/Makefile
index 304044480b..dcecf45357 100644
--- a/rtl/win16/Makefile
+++ b/rtl/win16/Makefile
@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile
index 50e68ef458..aa98744075 100644
--- a/rtl/win32/Makefile
+++ b/rtl/win32/Makefile
@@ -2429,8 +2429,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/win64/Makefile b/rtl/win64/Makefile
index 1776c511bd..ba840336c4 100644
--- a/rtl/win64/Makefile
+++ b/rtl/win64/Makefile
@@ -2450,8 +2450,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/wince/Makefile b/rtl/wince/Makefile
index 6a35de73bc..bd4dc44438 100644
--- a/rtl/wince/Makefile
+++ b/rtl/wince/Makefile
@@ -2416,8 +2416,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
diff --git a/rtl/zxspectrum/Makefile b/rtl/zxspectrum/Makefile
index e6b797fcf6..6b32a74b35 100644
--- a/rtl/zxspectrum/Makefile
+++ b/rtl/zxspectrum/Makefile
@@ -2391,8 +2391,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
-ifneq ($(findstring $(ARCH),x86_64 i386),)
-CPU_DEPS_OS:=$(CPU_DEPS_OS) $(SYSUTILSUNIT)$(PPUEXT)
+ifneq ($(findstring $(ARCH),x86_64 i386 i8086),)
+CPU_DEPS_CPU:=$(CPU_DEPS_CPU) $(SYSUTILSUNIT)$(PPUEXT)
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \