paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 23:31:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

* moved the common WASI RTL source files and includes to a 'wasicommon' dir

Browse Source
This commit is contained in:
Nikolay Nikolov 2025-02-28 14:46:17 +02:00
parent 40e41a846f
commit 7703ff9b34
23 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
rtl/wasip1/classes.pp → rtl/wasicommon/classes.pp
View File

0
rtl/wasip1/dos.pp → rtl/wasicommon/dos.pp
View File

0
rtl/wasip1/rtldefs.inc → rtl/wasicommon/rtldefs.inc
View File

0
rtl/wasip1/si_dll.pp → rtl/wasicommon/si_dll.pp
View File

0
rtl/wasip1/si_prc.pp → rtl/wasicommon/si_prc.pp
View File

0
rtl/wasip1/sysdir.inc → rtl/wasicommon/sysdir.inc
View File

0
rtl/wasip1/sysfile.inc → rtl/wasicommon/sysfile.inc
View File

0
rtl/wasip1/sysheap.inc → rtl/wasicommon/sysheap.inc
View File

0
rtl/wasip1/sysos.inc → rtl/wasicommon/sysos.inc
View File

0
rtl/wasip1/sysosh.inc → rtl/wasicommon/sysosh.inc
View File

0
rtl/wasip1/system.pp → rtl/wasicommon/system.pp
View File

0
rtl/wasip1/systhrd.inc → rtl/wasicommon/systhrd.inc
View File

0
rtl/wasip1/sysutils.pp → rtl/wasicommon/sysutils.pp
View File

0
rtl/wasip1/tthread.inc → rtl/wasicommon/tthread.inc
View File

0
rtl/wasip1/wasiapi.pp → rtl/wasicommon/wasiapi.pp
View File

0
rtl/wasip1/wasiinc/wasiprocs.inc → rtl/wasicommon/wasiinc/wasiprocs.inc
View File

0
rtl/wasip1/wasiinc/wasitypes.inc → rtl/wasicommon/wasiinc/wasitypes.inc
View File

0
rtl/wasip1/wasiutil.pp → rtl/wasicommon/wasiutil.pp
View File

0
rtl/wasip1/wasmmutex.inc → rtl/wasicommon/wasmmutex.inc
View File

15
rtl/wasip1/Makefile
View File

@ -914,6 +914,9 @@ CP_UNITS_SRC=$(addsuffix .pas,$(addprefix $(RTL)/charmaps/,$(CP_UNITS)))
endif
RTL=..
INC=../inc
WASICOMMONINC=$(RTL)/wasicommon
SYSTEMDIR=$(WASICOMMONINC)
DOSDIR=$(WASICOMMONINC)
NSOSDIR=$(NSDIR)/wasi
COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
@ -927,7 +930,7 @@ endif
ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
override FPC_SYSTEM_OPT += -Fiwasiinc
override FPC_SYSTEM_OPT += -Fi$(WASICOMMONINC)/wasiinc
DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(OBJPASUNIT) $(EXTPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(UUCHARUNIT) $(WASIAPIUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(MATHUNIT) $(RTLCONSTSUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(NOTHREADSUNIT) $(CLASSESUNIT) $(DOSUNIT) $(RESUNIT) $(HEAPTRCUNIT) $(WASIUTILUNIT) $(WEBASSEMBLYUNIT)
@ -937,7 +940,7 @@ override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WASICOMMONINC)
endif
ifeq ($(CPU_OS_TARGET),wasm32-wasip1)
override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
@ -2946,18 +2949,18 @@ include $(INC)/makefile.inc
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) wasiinc/wasitypes.inc wasiinc/wasiprocs.inc
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc
SYSUTILS_DEPS_OS=$(WASIUTILUNIT)$(PPUEXT)
si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
si_prc$(PPUEXT) : $(WASICOMMONINC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
si_dll$(PPUEXT) : si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
si_dll$(PPUEXT) : $(WASICOMMONINC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
WEBASSEMBLYDEPS=$(PROCINC)/webassembly.pp $(SYSTEMUNIT)$(PPUEXT) $(PROCINC)/cpuh.inc $(PROCINC)/cpuinnr.inc $(OBJPASUNIT)$(PPUEXT)
webassembly$(PPUEXT) : $(WEBASSEMBLYDEPS)
$(COMPILER) $<
Wasm.Api$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Api.pp $(WEBASSEMBLYDEPS)
$(COMPILER) $<
WASIAPIDEPS=wasiinc/wasitypes.inc wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)

15
rtl/wasip1/Makefile.fpc
View File

@ -24,12 +24,15 @@ target=wasip1
cpu=wasm32
[compiler]
includedir=$(INC) $(PROCINC)
includedir=$(INC) $(PROCINC) $(WASICOMMONINC)
sourcedir=$(INC) $(PROCINC) $(COMMON)
[prerules]
RTL=..
INC=../inc
WASICOMMONINC=$(RTL)/wasicommon
SYSTEMDIR=$(WASICOMMONINC)
DOSDIR=$(WASICOMMONINC)
NSOSDIR=$(NSDIR)/wasi
COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
@ -47,7 +50,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
override FPC_SYSTEM_OPT += -Fiwasiinc
override FPC_SYSTEM_OPT += -Fi$(WASICOMMONINC)/wasiinc
DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT)
@ -63,17 +66,17 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) wasiinc/wasitypes.inc wasiinc/wasiprocs.inc
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc
SYSUTILS_DEPS_OS=$(WASIUTILUNIT)$(PPUEXT)
#
# $(SYSINIT_UNITS) Units
#
si_prc$(PPUEXT) : si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
si_prc$(PPUEXT) : $(WASICOMMONINC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
si_dll$(PPUEXT) : si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
si_dll$(PPUEXT) : $(WASICOMMONINC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
#
@ -92,7 +95,7 @@ Wasm.Api$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Api.pp $(WEBASSEMBLYDEPS)
# WASIAPI
#
WASIAPIDEPS=wasiinc/wasitypes.inc wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc

18
rtl/wasip1threads/Makefile
View File

@ -914,9 +914,9 @@ CP_UNITS_SRC=$(addsuffix .pas,$(addprefix $(RTL)/charmaps/,$(CP_UNITS)))
endif
RTL=..
INC=../inc
WASIP1INC=$(RTL)/wasip1
SYSTEMDIR=$(WASIP1INC)
DOSDIR=$(WASIP1INC)
WASICOMMONINC=$(RTL)/wasicommon
SYSTEMDIR=$(WASICOMMONINC)
DOSDIR=$(WASICOMMONINC)
NSOSDIR=$(NSDIR)/wasi
COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
@ -930,7 +930,7 @@ endif
ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
override FPC_SYSTEM_OPT += -Fi$(WASIP1INC)/wasiinc
override FPC_SYSTEM_OPT += -Fi$(WASICOMMONINC)/wasiinc
DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT)
ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
override TARGET_UNITS+=$(SYSTEMUNIT) $(SYSINIT_UNITS) $(OBJPASUNIT) $(EXTPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(UUCHARUNIT) $(WASIAPIUNIT) $(CTYPESUNIT) $(STRINGSUNIT) $(SYSCONSTUNIT) $(SYSUTILSUNIT) $(SORTBASEUNIT) $(MATHUNIT) $(RTLCONSTSUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) $(GETOPTSUNIT) $(CHARSETUNIT) $(CPALLUNIT) $(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(NOTHREADSUNIT) $(CLASSESUNIT) $(DOSUNIT) $(RESUNIT) $(HEAPTRCUNIT) $(WASIUTILUNIT) $(WEBASSEMBLYUNIT)
@ -940,7 +940,7 @@ override TARGET_IMPLICITUNITS+=$(CP_UNITS) $(UNICODEDATAUNIT)
endif
override INSTALL_FPCPACKAGE=y y
ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WASIP1INC)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WASICOMMONINC)
endif
ifeq ($(CPU_OS_TARGET),wasm32-wasip1threads)
override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON)
@ -2949,18 +2949,18 @@ include $(INC)/makefile.inc
SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASIP1INC)/wasiinc/wasitypes.inc $(WASIP1INC)/wasiinc/wasiprocs.inc
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc
SYSUTILS_DEPS_OS=$(WASIUTILUNIT)$(PPUEXT)
si_prc$(PPUEXT) : $(WASIP1INC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
si_prc$(PPUEXT) : $(WASICOMMONINC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
si_dll$(PPUEXT) : $(WASIP1INC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
si_dll$(PPUEXT) : $(WASICOMMONINC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
WEBASSEMBLYDEPS=$(PROCINC)/webassembly.pp $(SYSTEMUNIT)$(PPUEXT) $(PROCINC)/cpuh.inc $(PROCINC)/cpuinnr.inc $(OBJPASUNIT)$(PPUEXT)
webassembly$(PPUEXT) : $(WEBASSEMBLYDEPS)
$(COMPILER) $<
Wasm.Api$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Api.pp $(WEBASSEMBLYDEPS)
$(COMPILER) $<
WASIAPIDEPS=$(WASIP1INC)/wasiinc/wasitypes.inc $(WASIP1INC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc
WASIApi.WASIApi$(PPUEXT) : $(NSOSDIR)/WASIApi.WASIApi.pp $(WASIAPIDEPS)

18
rtl/wasip1threads/Makefile.fpc
View File

@ -24,15 +24,15 @@ target=wasip1threads
cpu=wasm32
[compiler]
includedir=$(INC) $(PROCINC) $(WASIP1INC)
includedir=$(INC) $(PROCINC) $(WASICOMMONINC)
sourcedir=$(INC) $(PROCINC) $(COMMON)
[prerules]
RTL=..
INC=../inc
WASIP1INC=$(RTL)/wasip1
SYSTEMDIR=$(WASIP1INC)
DOSDIR=$(WASIP1INC)
WASICOMMONINC=$(RTL)/wasicommon
SYSTEMDIR=$(WASICOMMONINC)
DOSDIR=$(WASICOMMONINC)
NSOSDIR=$(NSDIR)/wasi
COMMON=$(RTL)/common
PROCINC=../$(CPU_TARGET)
@ -50,7 +50,7 @@ ifdef NO_EXCEPTIONS_IN_SYSTEM
override FPCOPT+=-dNO_EXCEPTIONS_IN_SYSTEM
endif
override FPC_SYSTEM_OPT += -Fi$(WASIP1INC)/wasiinc
override FPC_SYSTEM_OPT += -Fi$(WASICOMMONINC)/wasiinc
DOS_DEPS_OS=$(WASIAPIUNIT)$(PPUEXT) $(WASIUTILUNIT)$(PPUEXT)
@ -66,17 +66,17 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
include $(PROCINC)/makefile.cpu
SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
# Put system unit dependencies together.
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASIP1INC)/wasiinc/wasitypes.inc $(WASIP1INC)/wasiinc/wasiprocs.inc
SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) $(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc
SYSUTILS_DEPS_OS=$(WASIUTILUNIT)$(PPUEXT)
#
# $(SYSINIT_UNITS) Units
#
si_prc$(PPUEXT) : $(WASIP1INC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
si_prc$(PPUEXT) : $(WASICOMMONINC)/si_prc.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
si_dll$(PPUEXT) : $(WASIP1INC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
si_dll$(PPUEXT) : $(WASICOMMONINC)/si_dll.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
#
@ -95,7 +95,7 @@ Wasm.Api$(PPUEXT) : $(NSDIR)/wasm32/Wasm.Api.pp $(WEBASSEMBLYDEPS)
# WASIAPI
#
WASIAPIDEPS=$(WASIP1INC)/wasiinc/wasitypes.inc $(WASIP1INC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
WASIAPIDEPS=$(WASICOMMONINC)/wasiinc/wasitypes.inc $(WASICOMMONINC)/wasiinc/wasiprocs.inc $(SYSTEMUNIT)$(PPUEXT)
wasiapi$(PPUEXT) : wasiapi.pp $(WASIAPIDEPS)
$(COMPILER) $< -Fiwasiinc