Browse Source

Update Makefile's after cpu unit dependency fix

Pierre Muller 2 years ago
parent
commit
5004889c3c

+ 2 - 2
rtl/aix/Makefile

@@ -2423,8 +2423,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/amiga/Makefile

@@ -2455,8 +2455,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/android/Makefile

@@ -2562,8 +2562,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/aros/Makefile

@@ -2470,8 +2470,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/atari/Makefile

@@ -2425,8 +2425,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/beos/Makefile

@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/darwin/Makefile

@@ -2551,8 +2551,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/dragonfly/Makefile

@@ -2432,8 +2432,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/embedded/Makefile

@@ -2789,8 +2789,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/emx/Makefile

@@ -2431,8 +2431,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/freebsd/Makefile

@@ -2473,8 +2473,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/freertos/Makefile

@@ -2620,8 +2620,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/gba/Makefile

@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/go32v2/Makefile

@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/haiku/Makefile

@@ -2464,8 +2464,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/java/Makefile

@@ -2394,8 +2394,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/linux/Makefile

@@ -3024,8 +3024,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/macos/Makefile

@@ -2413,8 +2413,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/morphos/Makefile

@@ -2397,8 +2397,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/msdos/Makefile

@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/msxdos/Makefile

@@ -2394,8 +2394,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/nativent/Makefile

@@ -2401,8 +2401,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/nds/Makefile

@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/netbsd/Makefile

@@ -2529,8 +2529,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/netware/Makefile

@@ -2435,8 +2435,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/netwlibc/Makefile

@@ -2426,8 +2426,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/openbsd/Makefile

@@ -2462,8 +2462,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/os2/Makefile

@@ -2429,8 +2429,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/palmos/Makefile

@@ -2437,8 +2437,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/sinclairql/Makefile

@@ -2425,8 +2425,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/solaris/Makefile

@@ -2438,8 +2438,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/symbian/Makefile

@@ -2414,8 +2414,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/wasi/Makefile

@@ -2399,8 +2399,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/watcom/Makefile

@@ -2430,8 +2430,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/wii/Makefile

@@ -2393,8 +2393,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/win16/Makefile

@@ -2424,8 +2424,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/win32/Makefile

@@ -2429,8 +2429,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/win64/Makefile

@@ -2450,8 +2450,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/wince/Makefile

@@ -2416,8 +2416,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \

+ 2 - 2
rtl/zxspectrum/Makefile

@@ -2391,8 +2391,8 @@ rtlconsts$(PPUEXT) : $(RTLCONSTS_DEPS)
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 	$(COMPILER) $(RTLCONSTS_OPT) $<
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 System.RtlConsts$(PPUEXT) : $(NSINC)/System.RtlConsts.pp $(RTLCONSTS_DEPS)
 	$(COMPILER) -Fi$(OBJPASDIR) $(RTLCONSTS_OPT) $<
 	$(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
 endif
 CPU_DEPS=$(PROCINC)/cpu.pp \
 CPU_DEPS=$(PROCINC)/cpu.pp \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \
 	 $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) \