From f585b2d846d30a2f01407790d99957ce9150f6e6 Mon Sep 17 00:00:00 2001 From: nickysn Date: Fri, 22 Jan 2021 00:55:01 +0000 Subject: [PATCH] + si_prc startup unit added to the makefiles git-svn-id: branches/wasm@48306 - --- rtl/wasi/Makefile | 213 +++++++++++++++++++++--------------------- rtl/wasi/Makefile.fpc | 9 +- 2 files changed, 116 insertions(+), 106 deletions(-) diff --git a/rtl/wasi/Makefile b/rtl/wasi/Makefile index 6bea037820..fad7071777 100644 --- a/rtl/wasi/Makefile +++ b/rtl/wasi/Makefile @@ -357,6 +357,7 @@ COMMON=$(RTL)/common PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +SYSINIT_UNITS=si_prc OBJPASDIR=$(RTL)/objpas ifdef EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dEXCEPTIONS_IN_SYSTEM @@ -365,319 +366,319 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM endif ifeq ($(FULL_TARGET),i386-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-go32v2) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-win32) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-os2) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-freebsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-beos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-haiku) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-solaris) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-netware) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-openbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-wdosx) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-darwin) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-emx) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-watcom) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-netwlibc) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-wince) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-symbian) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-nativent) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-iphonesim) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i386-aros) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-amiga) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-atari) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-palmos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-macosclassic) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),m68k-sinclairql) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-amiga) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-macosclassic) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-darwin) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-morphos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-wii) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc-aix) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),sparc-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),sparc-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),sparc-solaris) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),sparc-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-haiku) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-solaris) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-openbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-darwin) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-win64) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),x86_64-dragonfly) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-netbsd) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-palmos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-wince) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-gba) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-nds) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-symbian) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-aros) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-freertos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),arm-ios) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc64-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc64-darwin) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc64-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),powerpc64-aix) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),avr-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),armeb-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),armeb-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),mips-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),mipsel-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),mipsel-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),mipsel-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),mips64el-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),jvm-java) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),jvm-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i8086-msdos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),aarch64-win64) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),aarch64-android) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),aarch64-ios) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),wasm32-wasm) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),wasm32-wasi) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),sparc64-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),riscv32-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),riscv32-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),riscv64-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),riscv64-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),xtensa-linux) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),xtensa-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),xtensa-freertos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),z80-embedded) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),z80-zxspectrum) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),z80-msxdos) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif ifeq ($(FULL_TARGET),z80-amstradcpc) -override TARGET_UNITS+=system +override TARGET_UNITS+=system $(SYSINIT_UNITS) endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) @@ -2616,3 +2617,5 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) system$(PPUEXT) : system.pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(EXECPPAS) +si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $< diff --git a/rtl/wasi/Makefile.fpc b/rtl/wasi/Makefile.fpc index 3ec1fd9ced..44baebdfd7 100644 --- a/rtl/wasi/Makefile.fpc +++ b/rtl/wasi/Makefile.fpc @@ -5,7 +5,7 @@ main=rtl [target] loaders= -units=system +units=system $(SYSINIT_UNITS) [require] nortl=y @@ -25,6 +25,7 @@ COMMON=$(RTL)/common PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl SYSTEMUNIT=system +SYSINIT_UNITS=si_prc # Paths OBJPASDIR=$(RTL)/objpas @@ -56,3 +57,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) system$(PPUEXT) : system.pp $(SYSDEPS) $(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp $(EXECPPAS) + +# +# $(SYSINIT_UNITS) Units +# +si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $<