* Fixes based on feedback of team, fixes issue #40368

compiler/msgidx.inc

@@ -1169,7 +1169,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 91712;
+  MsgTxtSize = 91710;
 
   MsgIdxMax : array[1..20] of longint=(
     28,109,371,134,102,63,148,38,223,71,

rtl/Makefile

@@ -191,43 +191,43 @@ else
 ARCH=$(CPU_TARGET)
 endif
 endif
-ifeq ($(FULL_TARGET),aarch64-embedded)
+ifeq ($(CPU_OS_TARGET),aarch64-embedded)
 endif
 ifdef SUB_TARGET 
 FPCOPT+=-t$(SUB_TARGET)
 FPMAKE_OPT+=--subtarget=$(SUB_TARGET)
 endif
-ifeq ($(FULL_TARGET),arm-embedded)
+ifeq ($(CPU_OS_TARGET),arm-embedded)
 ifeq ($(SUBARCH),)
 $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t or SUBARCH=armv7m) must be defined)
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),avr-embedded)
+ifeq ($(CPU_OS_TARGET),avr-embedded)
 ifeq ($(SUBARCH),)
 $(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined)
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),mipsel-embedded)
+ifeq ($(CPU_OS_TARGET),mipsel-embedded)
 ifeq ($(SUBARCH),)
 $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined)
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),xtensa-embedded)
+ifeq ($(CPU_OS_TARGET),xtensa-embedded)
 ifeq ($(SUBARCH),)
 $(error When compiling for xtensa-embedded, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),xtensa-freertos)
+ifeq ($(CPU_OS_TARGET),xtensa-freertos)
 ifeq ($(SUBARCH),)
 $(error When compiling for xtensa-freertos, a sub-architecture (e.g. SUBARCH=lx106 or SUBARCH=lx6) must be defined)
 endif
 override FPCOPT+=-Cp$(SUBARCH)
 endif
-ifeq ($(FULL_TARGET),arm-freertos)
+ifeq ($(CPU_OS_TARGET),arm-freertos)
 ifeq ($(SUBARCH),)
 $(error When compiling for arm-freertos, a sub-architecture (e.g. SUBARCH=armv6m or SUBARCH=armv7em) must be defined)
 endif

rtl/aix/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=aix
 
 [compiler]

rtl/amiga/Makefile.fpc

@@ -28,7 +28,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=amiga
 cpu=powerpc
 

rtl/android/Makefile.fpc

@@ -34,7 +34,6 @@ units=syslinux linux
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=android
 
 [compiler]

rtl/aros/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=aros
 override CPU_TARGET_DEFAULT=i386
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2249,6 +2249,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2282,7 +2285,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2386,7 +2389,7 @@ FPCYLIX_DEPS=fpcylix.pp \
 	     $(FPCYLIX_DEPS_OS)  $(FPCYLIX_DEPS_CPU)
 fpcylix$(PPUEXT) : $(FPCYLIX_DEPS)
 	$(COMPILER) $(FPCYLIX_OPT) $<
-TERMIO_DEPS=$(OSDIR)/termio.pp $(BASEUNIXUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)\
+TERMIO_DEPS=$(OSDIR)/termio.pp $(BASEUNIXUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
 	    $(TERMIO_DEPS_OS) $(TERMIO_DEPS_CPU)
 termio$(PPUEXT) : $(TERMIO_DEPS)
 	$(COMPILER) $(TERMIO_OPT) $<
@@ -2588,14 +2591,14 @@ unix$(PPUEXT): $(UNIX_DEPS)
 UnixApi.Unix$(PPUEXT) : $(NSINC)/UnixApi.Unix.pp $(UNIX_DEPS)
 	$(COMPILER) $(UNIX_OPT) $<
 SYSCALL_DEPS=$(UNIXINC)/syscall.pp \
-	     $(SYSTEMUNIT)$(PPUEXT)\
+	     $(SYSTEMUNIT)$(PPUEXT) \
 	     $(SYSCALL_DEPS_OS) $(SYSCALL_DEPS_CPU)
 syscall$(PPUEXT) : $(SYSCALL_DEPS)
 	$(COMPILER) $(SYSCALL_OPT) $<
 UnixApi.SysCall$(PPUEXT) : $(NSINC)/UnixApi.SysCall.pp $(SYSCALL_DEPS) 
 	$(COMPILER) $(SYSCALL_OPT) $<
-UNIXUTIL_DEPS=$(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc\
-	     $(SYSTEMUNIT)$(PPUEXT)\
+UNIXUTIL_DEPS=$(UNIXINC)/unixutil.pp $(INC)/textrec.inc $(INC)/filerec.inc \
+	     $(SYSTEMUNIT)$(PPUEXT) \
 	     $(UNIXUTIL_DEPS_OS)
 unixutil$(PPUEXT) : $(UNIXUTIL_DEPS)
 	$(COMPILER) $(UNIXUTIL_OPT) $<
@@ -2678,7 +2681,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/aros/Makefile.fpc

@@ -31,7 +31,6 @@ fpcpackage=y
 buildunit=buildrtl
 
 [default]
-fpcdir=../..
 target=aros
 cpu=i386
 

rtl/atari/Makefile.fpc

@@ -27,7 +27,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=atari
 cpu=m68k
 

rtl/beos/Makefile.fpc

@@ -33,7 +33,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=beos
 cpu=i386
 

rtl/darwin/Makefile

@@ -102,7 +102,7 @@ endif
 export ECHO
 endif
 override OS_TARGET_DEFAULT=darwin
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2334,6 +2334,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2367,7 +2370,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2763,7 +2766,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/darwin/Makefile.fpc

@@ -35,7 +35,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=darwin
 
 [compiler]

rtl/dragonfly/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=dragonfly
 
 [compiler]

rtl/embedded/Makefile.fpc

@@ -36,7 +36,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=embedded
 
 [compiler]

rtl/emx/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=emx
 override CPU_TARGET_DEFAULT=i386
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2214,6 +2214,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2247,7 +2250,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2643,7 +2646,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/emx/Makefile.fpc

@@ -33,7 +33,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=emx
 cpu=i386
 

rtl/freebsd/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=freebsd
 
 [compiler]

rtl/freertos/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=freertos
 
 [compiler]

rtl/gba/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=gba
 override CPU_TARGET_DEFAULT=arm
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2203,6 +2203,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2236,7 +2239,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2632,7 +2635,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/gba/Makefile.fpc

@@ -28,7 +28,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=gba
 cpu=arm
 

rtl/go32v2/Makefile.fpc

@@ -26,7 +26,6 @@ nortl=y
 [install]
 fpcpackage=y
 [default]
-fpcdir=../..
 target=go32v2
 cpu=i386
 [compiler]

rtl/haiku/Makefile.fpc

@@ -34,7 +34,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=haiku
 cpu=i386
 

rtl/inc/Makefile.rtl

@@ -600,6 +600,13 @@ ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
 
+# On some platforms, the DOS unit is in the buildrtl target, 
+# and will be specified in EXTPAS_DEPS_OS. If it is not, then we add the dos
+# unit as a dependency here
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
+
 #
 # Some units have the same name for dotted/non-dotted RTL. 
 # These units must be passed FPC_DOTTEDUNITS explicitly
@@ -675,7 +682,7 @@ iso7185$(PPUEXT) : $(ISO7185_DEPS)
 # extpas
 
 EXTPAS_DEPS=$(INC)/extpas.pp \
-            $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+            $(SYSTEMUNIT)$(PPUEXT) \
             $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
@@ -1452,7 +1459,7 @@ sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 #
 # bsd unit
 #

rtl/java/Makefile.fpc

@@ -16,7 +16,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=java
 
 [compiler]

rtl/linux/Makefile

@@ -102,7 +102,7 @@ endif
 export ECHO
 endif
 override OS_TARGET_DEFAULT=linux
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2801,6 +2801,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2834,7 +2837,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -3230,7 +3233,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/linux/Makefile.fpc

@@ -39,7 +39,6 @@ units=syslinux linux
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=linux
 
 [compiler]

rtl/macos/Makefile.fpc

@@ -31,7 +31,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=macosclassic
 
 [compiler]

rtl/morphos/Makefile.fpc

@@ -31,7 +31,6 @@ fpcpackage=y
 buildunit=buildrtl
 
 [default]
-fpcdir=../..
 target=morphos
 cpu=powerpc
 

rtl/msdos/Makefile.fpc

@@ -26,7 +26,6 @@ nortl=y
 [install]
 fpcpackage=y
 [default]
-fpcdir=../..
 target=msdos
 cpu=i8086
 [compiler]

rtl/msxdos/Makefile.fpc

@@ -30,7 +30,6 @@ nortl=y
 [install]
 fpcpackage=y
 [default]
-fpcdir=../..
 target=msxdos
 cpu=z80
 [compiler]

rtl/nativent/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=nativent
 
 [compiler]

rtl/nds/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=nds
 override CPU_TARGET_DEFAULT=arm
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2203,6 +2203,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2236,7 +2239,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2632,7 +2635,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/nds/Makefile.fpc

@@ -29,7 +29,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=nds
 cpu=arm
 

rtl/netbsd/Makefile.fpc

@@ -37,7 +37,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=netbsd
 
 [compiler]

rtl/netware/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=netware
 override CPU_TARGET_DEFAULT=i386
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2214,6 +2214,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2247,7 +2250,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2643,7 +2646,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/netware/Makefile.fpc

@@ -32,7 +32,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=netware
 cpu=i386
 

rtl/netwlibc/Makefile.fpc

@@ -32,7 +32,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=netwlibc
 
 [compiler]

rtl/openbsd/Makefile.fpc

@@ -37,7 +37,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=openbsd
 
 [compiler]

rtl/os2/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=os2
 override CPU_TARGET_DEFAULT=i386
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2212,6 +2212,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2245,7 +2248,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2641,7 +2644,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/os2/Makefile.fpc

@@ -32,7 +32,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=os2
 cpu=i386
 

rtl/palmos/Makefile.fpc

@@ -42,7 +42,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=palmos
 
 [compiler]

rtl/qnx/Makefile.fpc

@@ -19,7 +19,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=qnx
 cpu=i386
 

rtl/sinclairql/Makefile.fpc

@@ -28,7 +28,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=sinclairql
 cpu=m68k
 

rtl/solaris/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=solaris
 
 [compiler]

rtl/symbian/Makefile.fpc

@@ -21,7 +21,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=symbian
 
 [compiler]

rtl/wasi/Makefile.fpc

@@ -24,7 +24,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=wasi
 cpu=wasm32
 

rtl/watcom/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=watcom
 override CPU_TARGET_DEFAULT=i386
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2209,6 +2209,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2242,7 +2245,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2638,7 +2641,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/watcom/Makefile.fpc

@@ -38,7 +38,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=watcom
 cpu=i386
 

rtl/wii/Makefile

@@ -103,7 +103,7 @@ export ECHO
 endif
 override OS_TARGET_DEFAULT=wii
 override CPU_TARGET_DEFAULT=powerpc
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -2172,6 +2172,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2205,7 +2208,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2601,7 +2604,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)

rtl/wii/Makefile.fpc

@@ -28,7 +28,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=wii
 cpu=powerpc
 

rtl/win16/Makefile.fpc

@@ -23,7 +23,6 @@ nortl=y
 [install]
 fpcpackage=y
 [default]
-fpcdir=../..
 target=msdos
 cpu=i8086
 [compiler]

rtl/win32/Makefile.fpc

@@ -7,25 +7,23 @@ main=rtl
 
 [target]
 loaders=$(LOADERS)
-units=system uuchar objpas macpas iso7185 buildrtl cpall lineinfo lnfodwrf
-implicitunits=sysinitpas sysinitcyg sysinitgprof \
-      extpas \
-      ctypes strings \
-      heaptrc \
-      windows initc cmem dynlibs signals \
-      dos messages \
-      rtlconsts sysconst sysutils math types \
-      typinfo sortbase fgl classes \
-      cpu mmx charset character getopts \
-      fpwidestring \
-      winsysut sharemem exeinfo fpintres windirs \
-      softfpu sfpux80 ufloatx80 sfpu128 ufloat128 \
-      cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
-      cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \
-      cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 \
-      cp8859_5 cp8859_6 cp8859_7 cp8859_8 cp8859_9 cp8859_10 cp8859_11 \
-      cp8859_13 cp8859_14 cp8859_15 cp8859_16 cpkoi8_r cpkoi8_u \
-      unicodedata
+units=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
+implicitunits=sysinitpas sysinitcyg sysinitgprof initc extpas heaptrc winsysut \
+      $(CTYPESUNIT) $(STRINGSUNIT) \
+      $(DOSUNIT) $(MESSAGESUNIT) \
+      $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) \
+      $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) \
+      $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) \
+      $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \
+      $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) \
+      $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \
+      $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \
+      $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) \
+      $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) \
+      $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) \
+      $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) \
+      $(UNICODEDATAUNIT) \
+      $(CPU_UNITS)
 
 # shared=$(DLLS)
 
@@ -39,12 +37,11 @@ fpcpackage=y
 buildunit=buildrtl
 
 [default]
-fpcdir=../..
 target=win32
 
 [compiler]
-includedir=$(INC) $(PROCINC) $(WINDIR)
-sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
+includedir=$(INC) $(PROCINC) $(WINDIR) ./$(ARCH) $(WININC)
+sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR) ../$(ARCH)
 
 
 [prerules]
@@ -58,15 +55,18 @@ WINDIR=../win
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 DLLS=fpcmemdll
-
+CPU_UNITS=cpu signals mmx
 # Paths
 OBJPASDIR=$(RTL)/objpas
+FPC_SYSTEM_OPT=-Fu../win
 
 # Files used by windows.pp
 include $(WININC)/makefile.inc
 
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 
+EXTPAS_DEPS_OS=buildrtl$(PPUEXT)
+
 
 [rules]
 .NOTPARALLEL:
@@ -88,40 +88,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 
 
-#
-# Unit specific rules
-#
-
-system$(PPUEXT) : system.pp $(SYSDEPS)
-        $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp -Fi../win
-
-heaptrc$(PPUEXT) : $(INC)/heaptrc.pp $(SYSTEMUNIT)$(PPUEXT)
-        $(COMPILER) $(INC)/heaptrc.pp
-
-uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp heaptrc$(PPUEXT)
-	$(COMPILER) $(INC)/uuchar.pp
-
-objpas$(PPUEXT): $(OBJPASDIR)/objpas.pp $(INC)/except.inc system$(PPUEXT) heaptrc$(PPUEXT)
-        $(COMPILER) -I$(OBJPASDIR) $(OBJPASDIR)/objpas.pp
-
-macpas$(PPUEXT) : $(INC)/macpas.pp objpas$(PPUEXT) buildrtl$(PPUEXT) heaptrc$(PPUEXT)
-        $(COMPILER) $(INC)/macpas.pp
-
-iso7185$(PPUEXT) : $(INC)/iso7185.pp buildrtl$(PPUEXT) heaptrc$(PPUEXT)
-        $(COMPILER) $(INC)/iso7185.pp
-
-extpas$(PPUEXT) : $(INC)/extpas.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT)
-        $(COMPILER) $(INC)/extpas.pp
-
-lineinfo$(PPUEXT) : $(INC)/lineinfo.pp $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT)
-	$(COMPILER) $(INC)/lineinfo.pp
-
-lnfodwrf$(PPUEXT) : $(INC)/lnfodwrf.pp $(SYSTEMUNIT)$(PPUEXT) heaptrc$(PPUEXT)
-	$(COMPILER) $(INC)/lnfodwrf.pp
 
 buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) heaptrc$(PPUEXT)
         $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(WININC) -Fu$(WININC) -Fu$(WINDIR) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl
 
-cpall$(PPUEXT): $(RTL)/charmaps/cpall.pas system$(PPUEXT) objpas$(PPUEXT) heaptrc$(PPUEXT)
-        $(COMPILER) -Fu$(INC) -Fi$(RTL)/charmaps $(RTL)/charmaps/cpall.pas
-

rtl/win64/Makefile

@@ -102,7 +102,7 @@ endif
 export ECHO
 endif
 override OS_TARGET_DEFAULT=win64
-override DEFAULT_FPCDIR=../.. ../..
+override DEFAULT_FPCDIR=../..
 ifndef FPC
 ifdef PP
 FPC=$(PP)
@@ -879,7 +879,6 @@ OSDIR=win64
 NSOSDIR=$(NSDIR)/windows
 SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi../win
-SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
@@ -890,6 +889,7 @@ CPU_UNITS=cpu signals
 endif
 OBJPASDIR=$(RTL)/objpas
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
+FPC_SYSTEM_OPT=-Fi../win
 ifeq ($(CPU_OS_TARGET),x86_64-win64)
 override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
 endif
@@ -897,10 +897,10 @@ ifeq ($(CPU_OS_TARGET),aarch64-win64)
 override TARGET_UNITS+=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-win64)
-override TARGET_IMPLICITUNITS+=sysinit $(CTYPESUNIT) $(STRINGSUNIT) extpas heaptrc $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
+override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
 endif
 ifeq ($(CPU_OS_TARGET),aarch64-win64)
-override TARGET_IMPLICITUNITS+=sysinit $(CTYPESUNIT) $(STRINGSUNIT) extpas heaptrc $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
+override TARGET_IMPLICITUNITS+=sysinit extpas heaptrc fpintres $(CTYPESUNIT) $(STRINGSUNIT) $(DOSUNIT) $(MESSAGESUNIT) $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) $(CP863UNIT) $(CP864UNIT) $(CP865UNIT) $(CP866UNIT) $(CP869UNIT) $(CP874UNIT) $(CP3021UNIT) $(CP8859_1UNIT) $(CP8859_2UNIT) $(CP8859_3UNIT) $(CP8859_4UNIT) $(CP8859_5UNIT) $(CP8859_6UNIT) $(CP8859_7UNIT) $(CP8859_8UNIT) $(CP8859_9UNIT) $(CP8859_10UNIT) $(CP8859_11UNIT) $(CP8859_13UNIT) $(CP8859_14UNIT) $(CP8859_15UNIT) $(CP8859_16UNIT) $(CPKOI8_RUNIT) $(CPKOI8_UUNIT) $(UNICODEDATAUNIT) $(CPU_UNITS)
 endif
 ifeq ($(CPU_OS_TARGET),x86_64-win64)
 override TARGET_LOADERS+=$(LOADERS)
@@ -2232,6 +2232,9 @@ endif
 ifndef BASEUNIXDIR
 BASEUNIXDIR=$(UNIXINC)
 endif
+ifndef EXTPAS_DEPS_OS
+EXTPAS_DEPS_OS=$(DOSUNIT)$(PPUEXT)
+endif
 ifdef FPC_DOTTEDUNITS
 BLOCKRTL_OPT:=$(BLOCKRTL_OPT) -dFPC_DOTTEDUNITS
 FPEXTRES_OPT:=$(FPEXTRES_OPT) -dFPC_DOTTEDUNITS
@@ -2265,7 +2268,7 @@ ISO7185_DEPS= $(INC)/$(ISO7185UNIT).pp \
 iso7185$(PPUEXT) : $(ISO7185_DEPS)
 	$(COMPILER) $(ISO7185_OPT) $<
 EXTPAS_DEPS=$(INC)/extpas.pp \
-	    $(DOSUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) \
+	    $(SYSTEMUNIT)$(PPUEXT) \
 	    $(EXTPAS_DEPS_OS) $(EXTPAS_DEPS_CPU)
 extpas$(PPUEXT) : $(EXTPAS_DEPS)
 	$(COMPILER) $(EXTPAS_OPT) $<
@@ -2661,7 +2664,7 @@ SYSCTL_DEPS=$(BSDINC)/sysctl.pp $(SYSTEMUNIT)$(PPUEXT) $(UNIXTYPEUNIT)$(PPUEXT)
 sysctl$(PPUEXT) : $(SYSCTL_DEPS)
 	$(COMPILER) $(SYSCTL_OPT) $<
 BsdApi.SysCtl$(PPUEXT) : $(NSBSDDIR)/BsdApi.SysCtl.pp $(SYSCTL_DEPS)
-	$(COMPILER) $(BSD_OPT) $<
+	$(COMPILER) $(SYSCTL_OPT) $<
 BSD_DEPS=$(BSDINC)/bsd.pas $(INITCUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) \
 	 $(BSD_DEPS_OS) $(BSD_DEPS_CPU)
 bsd$(PPUEXT): $(BSD_DEPS)
@@ -2680,10 +2683,6 @@ BUILDUNITPATHS=-Fu$(WININC) -Fu$(WINDIR) -Fu$(INC) -Fu$(OBJPASDIR) -Fu../$(ARCH)
 ifdef FPC_DOTTEDUNITS
 BUILDRTL_OPT:=$(BUILDRTL_OPT) -Fu$(NSINC) -Fu$(NSOSDIR) -dFPC_DOTTEDUNITS 
 endif
-SYSTEM_DEPS=system.pp $(SYSDEPS) \
-	    $(SYSTEM_DEPS_OS) $(SYSTEM_DEPS_CPU)
-system$(PPUEXT) : $(SYSTEM_DEPS)
-	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $< -Fi../win
 BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) \
 	      $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU)
 buildrtl$(PPUEXT) : $(BUILDRTL_DEPS)

rtl/win64/Makefile.fpc

@@ -8,15 +8,14 @@ main=rtl
 [target]
 loaders=$(LOADERS)
 units=system uuchar objpas macpas $(ISO7185UNIT) buildrtl $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT)
-implicitunits=sysinit $(CTYPESUNIT) $(STRINGSUNIT) \
-      extpas \
-      heaptrc \
+implicitunits=sysinit extpas heaptrc fpintres \
+      $(CTYPESUNIT) $(STRINGSUNIT) \
       $(DOSUNIT) $(MESSAGESUNIT) \
       $(WINDOWSUNIT) $(CMEMUNIT) $(DYNLIBSUNIT) \
       $(RTLCONSTSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) \
       $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) $(CLASSESUNIT) $(GETOPTSUNIT) \
       $(CHARSETUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) \
-      $(SHAREMEMUNIT) $(EXEINFOUNIT) fpintres $(WINDIRSUNIT) \
+      $(SHAREMEMUNIT) $(EXEINFOUNIT) $(WINDIRSUNIT) \
       $(SOFTFPUUNIT) $(SFPUX80UNIT) $(UFLOATX80UNIT) $(SFPU128UNIT) $(UFLOAT128UNIT) \
       $(CP1250UNIT) $(CP1251UNIT) $(CP1252UNIT) $(CP1253UNIT) $(CP1254UNIT) $(CP1255UNIT) $(CP1256UNIT) $(CP1257UNIT) $(CP1258UNIT) \
       $(CP437UNIT) $(CP646UNIT) $(CP737UNIT) $(CP775UNIT) $(CP850UNIT) $(CP852UNIT) $(CP855UNIT) $(CP856UNIT) $(CP857UNIT) $(CP860UNIT) $(CP861UNIT) $(CP862UNIT) \
@@ -26,12 +25,6 @@ implicitunits=sysinit $(CTYPESUNIT) $(STRINGSUNIT) \
       $(UNICODEDATAUNIT) \
       $(CPU_UNITS)
 
-# mmx
-#      fpcmemdll
-#     winsysut signals
-#     no cygwin so far
-#	initc
-
 rsts=math typinfo classes sysconst
 
 programs=
@@ -46,7 +39,6 @@ fpcpackage=y
 buildunit= buildrtl
 
 [default]
-fpcdir=../..
 target=win64
 
 [compiler]
@@ -65,7 +57,7 @@ OSDIR=win64
 NSOSDIR=$(NSDIR)/windows
 SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi../win
-SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
+#SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT)
 
 UNITPREFIX=rtl
 SYSTEMUNIT=system
@@ -86,7 +78,7 @@ OBJPASDIR=$(RTL)/objpas
 #include $(WININC)/makefile.inc
 
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
-
+FPC_SYSTEM_OPT=-Fi../win
 
 [rules]
 SYSTEMPPU=$(addsuffix $(PPUEXT),system)
@@ -119,14 +111,6 @@ endif
 # Unit specific rules
 #
 
-
-SYSTEM_DEPS=system.pp $(SYSDEPS) \
-            $(SYSTEM_DEPS_OS) $(SYSTEM_DEPS_CPU)
-
-system$(PPUEXT) : $(SYSTEM_DEPS)
-	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $< -Fi../win
-
-
 BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) objpas$(PPUEXT) \
               $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU)
 

rtl/wince/Makefile.fpc

@@ -42,7 +42,6 @@ nortl=y
 fpcpackage=y
 
 [default]
-fpcdir=../..
 target=wince
 
 [compiler]

rtl/zxspectrum/Makefile.fpc

@@ -12,7 +12,6 @@ nortl=y
 [install]
 fpcpackage=y
 [default]
-fpcdir=../..
 target=zxspectrum
 cpu=z80
 [compiler]