From 70d25e3b60b2b1b4af15e81b24b3baf2a00fc3ea Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 28 Sep 2023 23:05:19 +0200 Subject: [PATCH] Remove OS spefic rules for system unit. Use SYSDEPS variable to add specific dependencies. Override FPC_SYTEM_OPT to add OS specific options. Use SYSTEMUNIT variable. --- rtl/aix/Makefile.fpc | 8 -------- rtl/amiga/Makefile.fpc | 2 +- rtl/android/Makefile.fpc | 7 +------ rtl/aros/Makefile.fpc | 2 +- rtl/atari/Makefile.fpc | 2 +- rtl/beos/Makefile.fpc | 2 +- rtl/dragonfly/Makefile.fpc | 11 ++--------- rtl/embedded/Makefile.fpc | 2 +- rtl/freebsd/Makefile.fpc | 14 ++------------ rtl/freertos/Makefile.fpc | 6 ++---- rtl/go32v2/Makefile.fpc | 6 ------ rtl/java/Makefile.fpc | 2 +- rtl/morphos/Makefile.fpc | 5 +---- rtl/msxdos/Makefile.fpc | 14 ++++---------- rtl/nativent/Makefile.fpc | 9 +++------ rtl/nds/Makefile.fpc | 9 +-------- rtl/netbsd/Makefile.fpc | 11 ++--------- rtl/netwlibc/Makefile.fpc | 12 ++---------- rtl/openbsd/Makefile.fpc | 11 ++--------- rtl/palmos/Makefile.fpc | 5 +---- rtl/qnx/Makefile.fpc | 11 ++--------- rtl/sinclairql/Makefile.fpc | 7 ++----- rtl/solaris/Makefile.fpc | 8 -------- rtl/symbian/Makefile.fpc | 2 +- rtl/wasi/Makefile.fpc | 2 +- rtl/wii/Makefile.fpc | 2 +- rtl/win16/Makefile.fpc | 15 +++++---------- rtl/win32/Makefile.fpc | 7 +++---- rtl/win64/Makefile.fpc | 7 +++---- rtl/wince/Makefile.fpc | 4 ++-- rtl/zxspectrum/Makefile.fpc | 9 +++------ 31 files changed, 52 insertions(+), 162 deletions(-) diff --git a/rtl/aix/Makefile.fpc b/rtl/aix/Makefile.fpc index b14e86c516..97c82b0f3d 100644 --- a/rtl/aix/Makefile.fpc +++ b/rtl/aix/Makefile.fpc @@ -106,11 +106,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp - diff --git a/rtl/amiga/Makefile.fpc b/rtl/amiga/Makefile.fpc index f632e54605..198fd6a350 100644 --- a/rtl/amiga/Makefile.fpc +++ b/rtl/amiga/Makefile.fpc @@ -91,7 +91,7 @@ endif # Base Units (System, strings, os-dependent-base-unit) # -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) $(BUILDRTL_OPT) buildrtl $(RESUNIT)$(PPUEXT) : $(INC)/$(RESUNIT).pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/android/Makefile.fpc b/rtl/android/Makefile.fpc index 96d460df61..414e8fb5c1 100644 --- a/rtl/android/Makefile.fpc +++ b/rtl/android/Makefile.fpc @@ -59,6 +59,7 @@ TERMIODIR=$(LINUXINC) PTHREADINCDIR=$(LINUXINC) PTYPESINCDIR=$(LINUXINC) +SYSTEMDIR = $(LINUXINC) SYSCALL_DEPS_OS=$(LINUXINC)/$(ARCH)/syscallh.inc $(LINUXINC)/$(ARCH)/sysnr.inc SYSUTILS_DEPS_OS=$(DLUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT) $(ERRORSUNIT)$(PPUEXT) SYSUTILSDIR=$(UNIXINC) @@ -134,10 +135,4 @@ prt0$(OEXT) : prt0.as dllprt0$(OEXT) : dllprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) --defsym CPU$(CPUBITS)=1 dllprt0.as -# -# $(SYSTEMUNIT) Units ($(SYSTEMUNIT), Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(LINUXINC)/$(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(LINUXINC)/$(SYSTEMUNIT).pp diff --git a/rtl/aros/Makefile.fpc b/rtl/aros/Makefile.fpc index 78bf8bfdad..214513afc6 100644 --- a/rtl/aros/Makefile.fpc +++ b/rtl/aros/Makefile.fpc @@ -87,6 +87,6 @@ prt0$(OEXT) : $(CPU_TARGET)/prt0.as # -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/atari/Makefile.fpc b/rtl/atari/Makefile.fpc index dedcb3df59..a6ab157790 100644 --- a/rtl/atari/Makefile.fpc +++ b/rtl/atari/Makefile.fpc @@ -65,6 +65,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # Base Units (System, strings, os-dependent-base-unit) # -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc index 72eff951aa..68019a4a76 100644 --- a/rtl/beos/Makefile.fpc +++ b/rtl/beos/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] loaders=prt0 cprt0 func dllprt -units=system $(UUCHARUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \ +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(BASEUNIXUNIT) $(UNIXTYPEUNIT) $(CTYPESUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(STRINGSUNIT) \ $(ERRORSUNIT) $(DOSUNIT) $(DLUNIT) $(CTHREADSUNIIT) \ $(SYSCONSTUNIT) $(SYSUTILSUNIT) \ $(TYPESUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MATHUNIT) \ diff --git a/rtl/dragonfly/Makefile.fpc b/rtl/dragonfly/Makefile.fpc index eae03a316f..4ad2da83bc 100644 --- a/rtl/dragonfly/Makefile.fpc +++ b/rtl/dragonfly/Makefile.fpc @@ -97,8 +97,8 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - +SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS) +SYSTEMDIR = $(BSDINC) # # Loaders @@ -116,10 +116,3 @@ gprt0$(OEXT) : $(CPU_TARGET)/gprt0.as dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp - diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index a25df90df7..0a2138c790 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -285,7 +285,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp -FPC_SYSTEM_OPT=@system.cfg +override FPC_SYSTEM_OPT += @system.cfg # # Loaders diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index ddf36f5ba5..af25be75cf 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -103,8 +103,8 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - +SYSDEPS = unxconst.inc $(SYSINCDEPS) $(SYSCPUDEPS) +SYSTEMDIR = $(BSDINC) # # Loaders @@ -122,13 +122,6 @@ gprt0$(OEXT) : $(CPU_TARGET)/gprt0.as dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp unxconst.inc $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp - # # freebsd unit # @@ -138,7 +131,6 @@ else FREEBSD_DEPS_OS+=$(INITCUNIT)$(PPUEXT) endif - FREEBSD_DEPS = freebsd.pas $(SYSTEMUNIT)$(PPUEXT) $(BASEUNIXUNIT)$(PPUEXT) $(SYSCTLUNIT)$(PPUEXT) \ $(FREEBSD_DEPS_OS) $(FREEBSD_DEPS_CPU) @@ -148,5 +140,3 @@ freebsd$(PPUEXT): $(FREEBSD_DEPS) FreeBSDApi.FreeBSD$(PPUEXT): $(NSFREEBSDDIR)/FreeBSDApi.FreeBSD.pas $(FREEBSD_DEPS) $(COMPILER) $(FREEBSD_OPT) $< - - diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc index 8abdf3d1d1..a56629b6e0 100644 --- a/rtl/freertos/Makefile.fpc +++ b/rtl/freertos/Makefile.fpc @@ -256,7 +256,8 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) +SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp +override FPC_SYSTEM_OPT += @system.cfg # # Loaders @@ -269,9 +270,6 @@ startup$(OEXT) : $(CPU_TARGET)/startup.s # Base Units (System, $(STRINGSUNIT), os-dependent-base-unit) # -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp @system.cfg $(REDIR) - consoleio$(PPUEXT) : consoleio.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $< diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index 2d0f698bad..9846702403 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -80,12 +80,6 @@ exceptn$(OEXT) : exceptn.as fpu$(OEXT) : fpu.as $(AS) -o $(UNITTARGETDIRPREFIX)fpu$(OEXT) $< -# -# System Units (System, Objpas, Strings) -# -system$(PPUEXT) : system.pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - $(EXECPPAS) # # System Dependent Units diff --git a/rtl/java/Makefile.fpc b/rtl/java/Makefile.fpc index 07e5843e59..7371b886d7 100644 --- a/rtl/java/Makefile.fpc +++ b/rtl/java/Makefile.fpc @@ -44,7 +44,7 @@ endif # Paths -FPC_SYSTEM_OPT=@rtl.cfg +override FPC_SYSTEM_OPT += @rtl.cfg [rules] .NOTPARALLEL: diff --git a/rtl/morphos/Makefile.fpc b/rtl/morphos/Makefile.fpc index a4b86510d4..04e3920b1c 100644 --- a/rtl/morphos/Makefile.fpc +++ b/rtl/morphos/Makefile.fpc @@ -76,9 +76,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # Base Units (System, strings, os-dependent-base-unit) # -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp $(REDIR) - -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(HEAPTRCUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/msxdos/Makefile.fpc b/rtl/msxdos/Makefile.fpc index 86a2d4b17b..e6bc94b894 100644 --- a/rtl/msxdos/Makefile.fpc +++ b/rtl/msxdos/Makefile.fpc @@ -5,7 +5,7 @@ main=rtl [target] #loaders=prt0s prt0t prt0m prt0c prt0l prt0h # exceptn fpu -units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \ +units=$(SYSTEMUNIT) si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \ $(GETOPTSUNIT) $(EXEINFOUNIT) $(HEAPTRCUNIT) #$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(DOSUNIT) $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) \ # $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(TYPESUNIT) \ @@ -62,7 +62,8 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES)) include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) +SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc + # # Loaders # @@ -70,16 +71,9 @@ ifneq ($(findstring -dTEST_I8086_SMARTLINK_SECTIONS,$(FPCOPT)),) override NASM_OPT+=-D__I8086_SMARTLINK_SECTIONS__ endif -# -# System Units (System, Objpas, Strings) -# -system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - $(EXECPPAS) - # # Other system-dependent RTL Units # -si_prc$(PPUEXT) : system$(PPUEXT) +si_prc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) si_prc.pp diff --git a/rtl/nativent/Makefile.fpc b/rtl/nativent/Makefile.fpc index a98577c151..eedaa5e405 100644 --- a/rtl/nativent/Makefile.fpc +++ b/rtl/nativent/Makefile.fpc @@ -7,8 +7,8 @@ main=rtl [target] loaders= -#units=system $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT) -units=system $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl +#units=$(SYSTEMUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) buildrtl $(LINEINFOUNIT) $(LNFODWRFUNIT) +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(CPALLUNIT) buildrtl implicitunits=ndk ndkutils ddk \ $(CTYPESUNIT) $(STRINGSUNIT) \ # $(HEAPTRCUNIT) @@ -104,9 +104,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # Unit specific rules # -system$(PPUEXT) : system.pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -Fi$(DDKINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/nds/Makefile.fpc b/rtl/nds/Makefile.fpc index 2fb577768c..deda0717a0 100644 --- a/rtl/nds/Makefile.fpc +++ b/rtl/nds/Makefile.fpc @@ -64,7 +64,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(INC)/softfpu.pp - +override FPC_SYSTEM_OPT += @rtl.cfg # # Loaders @@ -82,10 +82,3 @@ cprt07$(OEXT) : cprt07.as cprt09$(OEXT) : cprt09.as $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt09$(OEXT) cprt09.as -# -# Base Units (System, strings, os-dependent-base-unit) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) $(INC)/softfpu.pp - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) - diff --git a/rtl/netbsd/Makefile.fpc b/rtl/netbsd/Makefile.fpc index d694b90b3b..c614e3bf46 100644 --- a/rtl/netbsd/Makefile.fpc +++ b/rtl/netbsd/Makefile.fpc @@ -100,8 +100,8 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - +SYSDEPS = sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS) +SYSTEMDIR = $(BSDINC) # # Loaders @@ -116,10 +116,3 @@ cprt0$(OEXT) : $(CPU_TARGET)/cprt0.as dllprt0$(OEXT) : $(CPU_TARGET)/dllprt0.as $(AS) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(CPU_TARGET)/dllprt0.as -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp - diff --git a/rtl/netwlibc/Makefile.fpc b/rtl/netwlibc/Makefile.fpc index 1d9546d9ea..66e1ba4d55 100644 --- a/rtl/netwlibc/Makefile.fpc +++ b/rtl/netwlibc/Makefile.fpc @@ -83,7 +83,7 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) +SYSDEPS = libc.pp $(SYSINCDEPS) $(SYSCPUDEPS) copyimpfiles: $(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR) @@ -100,7 +100,7 @@ copyimpfiles: # for now use the gcc pre nwplibc$(OEXT) : - cp pre/libcpre.gcc.o $(UNITTARGETDIRPREFIX)nwplibc$(OEXT) + cp pre/libcpre.gcc.o $(UNITTARGETDIRPREFIX)nwplibc$(OEXT) nwl_main$(OEXT) : nwl_main.as $(AS) -o $(UNITTARGETDIRPREFIX)nwl_main$(OEXT) nwl_main.as @@ -108,14 +108,6 @@ nwl_main$(OEXT) : nwl_main.as nwl_dlle$(OEXT) : nwl_dlle.as $(AS) -o $(UNITTARGETDIRPREFIX)nwl_dlle$(OEXT) nwl_dlle.as -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp libc.pp $(SYSDEPS) - $(COPY) $(IMPFILES) $(COMPILER_UNITTARGETDIR) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp - # # System Dependent Units # diff --git a/rtl/openbsd/Makefile.fpc b/rtl/openbsd/Makefile.fpc index b4c59fc110..2dbbcb03ad 100644 --- a/rtl/openbsd/Makefile.fpc +++ b/rtl/openbsd/Makefile.fpc @@ -108,8 +108,8 @@ include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - +SYSDEPS= sysconst.inc systypes.inc syscalls.inc $(SYSINCDEPS) $(SYSCPUDEPS) +SYSTEMDIR = $(BSDINC) # # Loaders @@ -135,10 +135,3 @@ si_g$(PPUEXT) : si_g.pp si_intf.inc si_impl.inc $(ARCH)/openbsd_ident.inc $(ARCH $(COMPILER) $< -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(BSDINC)/$(SYSTEMUNIT).pp sysconst.inc systypes.inc syscalls.inc $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(BSDINC)/$(SYSTEMUNIT).pp - diff --git a/rtl/palmos/Makefile.fpc b/rtl/palmos/Makefile.fpc index 7b7e0097d7..8a5d04e404 100644 --- a/rtl/palmos/Makefile.fpc +++ b/rtl/palmos/Makefile.fpc @@ -75,7 +75,7 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - +override FPC_SYSTEM_OPT += @rtl.cfg # # Loaders @@ -89,9 +89,6 @@ $(PRT0)$(OEXT) : $(CPU_TARGET)/$(PRT0).as # System Units (System, Objpas, Strings) # -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp - si_prc$(PPUEXT): si_prc.pp palmos.inc $(SYSTEMUNIT)$(PPUEXT) # diff --git a/rtl/qnx/Makefile.fpc b/rtl/qnx/Makefile.fpc index 7a9dc3dada..e3ebeb4ab5 100644 --- a/rtl/qnx/Makefile.fpc +++ b/rtl/qnx/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] loaders=cprt0 crti crtn -units=system $(UUCHARUNIT) $(DOSUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \ +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(DOSUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \ $(SYSUTILSUNIT) $(TYPINFOUNIT) $(MATHUNIT) \ $(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix rsts=$(MATHUNIT) $(TYPINFOUNIT) @@ -78,16 +78,9 @@ func$(OEXT) : $(CPU_TARGET)/func.as dllprt$(OEXT) : $(CPU_TARGET)/dllprt.as $(AS) -o dllprt$(OEXT) $(CPU_TARGET)/dllprt.as -# -# system Units (system, Objpas, Strings) -# - -system$(PPUEXT) : system.pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - # # Other system-dependent RTL Units # posix$(PPUEXT) : posix.pp \ - errno.inc osposix.inc osposixh.inc signal.inc system$(PPUEXT) + errno.inc osposix.inc osposixh.inc signal.inc $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/sinclairql/Makefile.fpc b/rtl/sinclairql/Makefile.fpc index 223a6f6550..135e5edb60 100644 --- a/rtl/sinclairql/Makefile.fpc +++ b/rtl/sinclairql/Makefile.fpc @@ -59,16 +59,13 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) qdos.inc qdosh.inc qdosfuncs.inc sms.inc - +override FPC_SYSTEM_OPT += @rtl.cfg # # Base Units (System, strings, os-dependent-base-unit) # -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg @rtl.cfg $(SYSTEMUNIT).pp $(REDIR) - -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(CPU_TARGET) -Fu$(PROCINC) -Fu$(AMIINC) -I$(INC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl #fpextres$(PPUEXT) : $(INC)/fpextres.pp $(SYSTEMUNIT)$(PPUEXT) diff --git a/rtl/solaris/Makefile.fpc b/rtl/solaris/Makefile.fpc index c69d0d4a94..369cb1163b 100644 --- a/rtl/solaris/Makefile.fpc +++ b/rtl/solaris/Makefile.fpc @@ -102,11 +102,3 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) - -# -# System Units (System, Objpas, Strings) -# - -$(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg $(SYSTEMUNIT).pp - diff --git a/rtl/symbian/Makefile.fpc b/rtl/symbian/Makefile.fpc index de6645d302..1646f951a2 100644 --- a/rtl/symbian/Makefile.fpc +++ b/rtl/symbian/Makefile.fpc @@ -82,6 +82,6 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # System Units (System, Objpas, Strings) # -buildrtl$(PPUEXT): buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) # $(MACPASUNIT)$(PPUEXT) +buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) # $(MACPASUNIT)$(PPUEXT) $(COMPILER) -Fi$(OBJPASDIR)/sysutils -Fi$(OBJPASDIR)/classes -Fu$(PROCINC) -I$(OBJPASDIR) -I$(INC) -I$(SYMBIANINC) -I$(UIQINC) -Fu$(INC) -Fu$(OBJPASDIR) buildrtl diff --git a/rtl/wasi/Makefile.fpc b/rtl/wasi/Makefile.fpc index 89c8286e2b..59a5780479 100644 --- a/rtl/wasi/Makefile.fpc +++ b/rtl/wasi/Makefile.fpc @@ -48,7 +48,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM endif -FPC_SYSTEM_OPT=-Fiwasiinc +override FPC_SYSTEM_OPT += -Fiwasiinc DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT) diff --git a/rtl/wii/Makefile.fpc b/rtl/wii/Makefile.fpc index 644744cb63..ec080896e8 100644 --- a/rtl/wii/Makefile.fpc +++ b/rtl/wii/Makefile.fpc @@ -38,7 +38,7 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system -override FPC_SYSTEM_OPT+=@rtl.cfg +override FPC_SYSTEM_OPT += @rtl.cfg ifdef RELEASE override FPCOPT+=-Ur diff --git a/rtl/win16/Makefile.fpc b/rtl/win16/Makefile.fpc index fcb513c6b9..f2c8c11839 100644 --- a/rtl/win16/Makefile.fpc +++ b/rtl/win16/Makefile.fpc @@ -5,7 +5,7 @@ main=rtl [target] loaders=prt0s prt0m prt0c prt0l prt0h -units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(DOSUNIT) \ +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(DOSUNIT) \ $(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) \ $(SYSCONSTUNIT) $(RTLCONSTSUNIT) $(SYSUTILSUNIT) $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) \ $(CLASSESUNIT) $(CHARSETUNIT) $(CPUUNIT) $(GETOPTSUNIT) $(CPALLUNIT) \ @@ -57,7 +57,10 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES)) include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) # Put system unit dependencies together. -SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) +SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) wintypes.inc winprocsh.inc winprocs.inc \ + glbheap.inc glbheaph.inc locheap.inc locheaph.inc \ + sysdl.inc sysdlh.inc + # # Loaders # @@ -76,12 +79,4 @@ prt0l$(OEXT) : prt0l.asm prt0comn.asm prt0h$(OEXT) : prt0h.asm prt0comn.asm $(MAKE) $(COMPILER_UNITTARGETDIR) $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm -# -# System Units (System, Objpas, Strings) -# -system$(PPUEXT) : system.pp $(SYSDEPS) wintypes.inc winprocsh.inc winprocs.inc \ - glbheap.inc glbheaph.inc locheap.inc locheaph.inc \ - sysdl.inc sysdlh.inc - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - $(EXECPPAS) diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index fa58e845c4..18b0bb2bec 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] loaders=$(LOADERS) -units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) implicitunits=sysinitpas sysinitcyg sysinitgprof $(INITCUNIT) $(EXTPASUNIT) $(HEAPTRCUNIT) \ $(WINSYSUTUNIT) $(CTYPESUNIT) $(STRINGSUNIT) \ $(DOSUNIT) $(MESSAGESUNIT) \ @@ -46,7 +46,6 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) WININC=../win/wininc WINDIR=../win -OSDIR=win32 NSOSDIR=$(NSDIR)/windows UNITPREFIX=rtl @@ -55,7 +54,7 @@ DLLS=fpcmemdll CPU_UNITS=$(CPUUNIT) $(SIGNALSUNIT) $(MMXUNIT) # Paths OBJPASDIR=$(RTL)/objpas -FPC_SYSTEM_OPT=-Fu$(WINDIR) +override FPC_SYSTEM_OPT += -Fu$(WINDIR) SYSUTILSDIR=$(WINDIR) SYSUTILS_OPT=-Fi$(WINDIR) SYSUTILS_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) $(WINDIRSUNIT)$(PPUEXT) @@ -106,7 +105,7 @@ endif # Unit specific rules # -BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ +BUILDRTL_DEPS=buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU) buildrtl$(PPUEXT) : $(BUILDRTL_DEPS) diff --git a/rtl/win64/Makefile.fpc b/rtl/win64/Makefile.fpc index 2ffc5043ae..c294576c39 100644 --- a/rtl/win64/Makefile.fpc +++ b/rtl/win64/Makefile.fpc @@ -7,7 +7,7 @@ main=rtl [target] loaders=$(LOADERS) -units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) +units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(WINDOWSUNIT) $(SYSUTILSUNIT) buildrtl $(CHARSETUNIT) $(CPALLUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) implicitunits=sysinit $(EXTPASUNIT) $(HEAPTRCUNIT) $(FPINTRESUNIT) \ $(CTYPESUNIT) $(STRINGSUNIT) \ $(DOSUNIT) $(MESSAGESUNIT) \ @@ -48,7 +48,6 @@ COMMON=$(RTL)/common PROCINC=$(RTL)/$(CPU_TARGET) WININC=../win/wininc WINDIR=../win -OSDIR=win64 NSOSDIR=$(NSDIR)/windows SYSUTILSDIR=$(WINDIR) SYSUTILS_OPT=-Fi../win @@ -83,7 +82,7 @@ OBJPASDIR=$(RTL)/objpas #include $(WININC)/makefile.inc WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) -FPC_SYSTEM_OPT=-Fi../win +override FPC_SYSTEM_OPT += -Fi../win EXEINFO_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) FPWIDESTRING_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) TYPES_DEPS_OS=$(WINDOWSUNIT)$(PPUEXT) @@ -120,7 +119,7 @@ endif # Unit specific rules # -BUILDRTL_DEPS=buildrtl.pp system$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ +BUILDRTL_DEPS=buildrtl.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) $(WINDOWSUNIT)$(PPUEXT) $(SYSUTILSUNIT)$(PPUEXT) \ $(BUILDRTL_DEPS_OS) $(BUILDRTL_DEPS_CPU) buildrtl$(PPUEXT) : $(BUILDRTL_DEPS) diff --git a/rtl/wince/Makefile.fpc b/rtl/wince/Makefile.fpc index e0691600bf..9fe043b153 100644 --- a/rtl/wince/Makefile.fpc +++ b/rtl/wince/Makefile.fpc @@ -106,9 +106,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) winres.inc WINMESSAGESDIR=$(OSDIR) -sharemem$(PPUEXT) : $(WINDIR)/sharemem.pp system$(PPUEXT) +sharemem$(PPUEXT) : $(WINDIR)/sharemem.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(WINDIR)/sharemem.pp -fpcmemdll.dll : $(WINDIR)/fpcmemdll.pp system$(PPUEXT) +fpcmemdll.dll : $(WINDIR)/fpcmemdll.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(WINDIR)/fpcmemdll.pp diff --git a/rtl/zxspectrum/Makefile.fpc b/rtl/zxspectrum/Makefile.fpc index b0365e57a0..257a08c1ed 100644 --- a/rtl/zxspectrum/Makefile.fpc +++ b/rtl/zxspectrum/Makefile.fpc @@ -5,7 +5,7 @@ main=rtl [target] loaders= -units=system si_prc +units=$(SYSTEMUNIT) si_prc [require] nortl=y @@ -50,11 +50,8 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) # -# System Units (System, Objpas, Strings) +# Loaders # -system$(PPUEXT) : system.pp $(SYSDEPS) - $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp - $(EXECPPAS) -si_prc$(PPUEXT) : system$(PPUEXT) +si_prc$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) si_prc.pp