paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 18:29:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Regenerate amiga, embedded, and go32v2 Makefile's

Browse Source
This commit is contained in:
Pierre Muller 2023-09-29 22:21:25 +02:00
parent 261e66fb84
commit e11838c5bd
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/amiga/Makefile
View File

@ -2955,5 +2955,3 @@ BUILDRTL_OPT:=$(BUILDRTL_OPT) -Fu$(NSINC) -Fu$(NSOSDIR) -dFPC_DOTTEDUNITS
endif endif
buildrtl$(PPUEXT): buildrtl.pp $(SYSTEMUNIT)$(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 $(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)
$(COMPILER) -Sg $(INC)/$(RESUNIT).pp

14
rtl/embedded/Makefile
View File

@ -900,7 +900,7 @@ CPU_UNITS=
SYSINIT_UNITS= SYSINIT_UNITS=
CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \ CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) \
$(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \ $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) \
$(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) $(SOFTFPUUNIT)
SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT) SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
DOSDIR=. DOSDIR=.
DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT) DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
@ -3316,21 +3316,17 @@ EmbeddedApi.HeapMGR$(PPUEXT) : $(NSOSDIR)/EmbeddedApi.HeapMGR.pp $(HEAPMGR_DEPS)
$(COMPILER) $(HEAPMGR_OPT) -Fi. $< $(COMPILER) $(HEAPMGR_OPT) -Fi. $<
define CPU_UNITS_RULE define CPU_UNITS_RULE
ifndef FPC_DOTTEDUNITS ifndef FPC_DOTTEDUNITS
ifeq ($(ARCH),avr) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
else
$(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT)
endif
else else
$(eval UNIT_REG_NAME=$(subst EmbeddedApi.,,$(1))) $(eval UNIT_REG_NAME=$(subst EmbeddedApi.,,$(1)))
$(eval UNIT_REG_NAME=$(subst ARMApi.,,$(UNIT_REG_NAME))) $(eval UNIT_REG_NAME=$(subst ARMApi.,,$(UNIT_REG_NAME)))
ifeq ($(ARCH),avr) ifeq ($(ARCH),avr)
$(1)$(PPUEXT): $(ARCH)/$(1).pp intrinsics$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
else else
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
$(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(ARCH)/$(1).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
else else
$(1)$(PPUEXT): $(NSOSDIR)/$(ARCH)/$(1).pp $(ARCH)/$(UNIT_REG_NAME).pp $(SYSTEMUNIT)$(PPUEXT) $(1)$(PPUEXT): $(NSOSDIR)/$(ARCH)/$(1).pp $(ARCH)/$(UNIT_REG_NAME).pp $(SYSTEMUNIT)$(PPUEXT) $(addsuffix $(PPUEXT),$(CPU_SPECIFIC_COMMON_UNITS))
endif endif
endif endif
endif endif

1
rtl/go32v2/Makefile
View File

@ -892,6 +892,7 @@ ifndef FPC_DOTTEDUNITS
RTLCONSTSUNIT=rtlconst RTLCONSTSUNIT=rtlconst
endif endif
INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT) INITC_DEPS_OS=$(DPMIEXCPUNIT)$(PPUEXT)
DOS_DEPS_OS = $(GO32UNIT)$(PPUEXT)
SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) $(GO32UNIT)$(PPUEXT) SYSUTILS_DEPS_OS = $(DOSUNIT)$(PPUEXT) $(GO32UNIT)$(PPUEXT)
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
ifdef EXCEPTIONS_IN_SYSTEM ifdef EXCEPTIONS_IN_SYSTEM