|
|
@@ -936,37 +936,39 @@ SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
|
|
|
DOSDIR=.
|
|
|
DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
|
|
|
ifeq ($(ARCH),aarch64)
|
|
|
-CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT) $(INTRINSICSUNIT)
|
|
|
+CPU_SPECIFIC_COMMON_UNITS=$(INTRINSICSUNIT)
|
|
|
+CPU_UNITS=$(RASPI3UNIT) $(MMIOUNIT) $(MAILBOXUNIT) $(RASPIUARTUNIT) $(GPIOUNIT)
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(ARCH),arm)
|
|
|
+CPU_SPECIFIC_COMMON_UNITS=$(INTRINSICSUNIT)
|
|
|
ifeq ($(SUBARCH),armv7m)
|
|
|
CPU_UNITS=$(LM3FURYUNIT) $(LM3TEMPESTUNIT) $(STM32F10X_LDUNIT) $(STM32F10X_MDUNIT) $(STM32F10X_HDUNIT) \
|
|
|
$(STM32F10X_XLUNIT) $(STM32F10X_CONNUNIT) $(STM32F10X_CLUNIT) $(LPC13XXUNIT) $(LPC1768UNIT) \
|
|
|
- $(SAM3X8EUNIT) $(XMC4500UNIT) $(CORTEXM3UNIT) $(CORTEXM4UNIT) $(INTRINSICSUNIT) # thumb2_bare
|
|
|
+ $(SAM3X8EUNIT) $(XMC4500UNIT) $(CORTEXM3UNIT) $(CORTEXM4UNIT) # thumb2_bare
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(SUBARCH),armv7em)
|
|
|
CPU_UNITS=$(LM4F120UNIT) $(XMC4500UNIT) $(MK20D5UNIT) $(MK20D7UNIT) $(MK22F51212UNIT) $(MK64F12UNIT) \
|
|
|
$(STM32F401XXUNIT) $(STM32F407XXUNIT) $(STM32F411XEUNIT) $(STM32F429XXUNIT) $(STM32F446XXUNIT) \
|
|
|
$(STM32F745UNIT) $(STM32F746UNIT) $(STM32F756UNIT) $(NRF52UNIT) $(CORTEXM3UNIT) $(CORTEXM4UNIT) $(CORTEXM7UNIT) \
|
|
|
- $(SAMD51P19AUNIT) $(INTRINSICSUNIT) # thumb2_bare
|
|
|
+ $(SAMD51P19AUNIT) # thumb2_bare
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(SUBARCH),armv4t)
|
|
|
-CPU_UNITS=$(LPC21X4UNIT) $(AT91SAM7X256UNIT) $(SC32442BUNIT) $(INTRINSICSUNIT)
|
|
|
+CPU_UNITS=$(LPC21X4UNIT) $(AT91SAM7X256UNIT) $(SC32442BUNIT)
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(SUBARCH),armv4)
|
|
|
-CPU_UNITS=$(LPC21X4UNIT) $(AT91SAM7X256UNIT) $(SC32442BUNIT) $(INTRINSICSUNIT)
|
|
|
+CPU_UNITS=$(LPC21X4UNIT) $(AT91SAM7X256UNIT) $(SC32442BUNIT)
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(SUBARCH),armv6m)
|
|
|
-CPU_UNITS=$(LPC8XXUNIT) $(LPC11XXUNIT) $(LPC122XUNIT) $(STM32F0XXUNIT) $(NRF51UNIT) $(CORTEXM0UNIT) $(RP2040UNIT) $(INTRINSICSUNIT)
|
|
|
+CPU_UNITS=$(LPC8XXUNIT) $(LPC11XXUNIT) $(LPC122XUNIT) $(STM32F0XXUNIT) $(NRF51UNIT) $(CORTEXM0UNIT) $(RP2040UNIT)
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(SUBARCH),armv7a)
|
|
|
-CPU_UNITS=$(ALLWINNER_A20UNIT) $(RASPI2UNIT) $(INTRINSICSUNIT)
|
|
|
+CPU_UNITS=$(ALLWINNER_A20UNIT) $(RASPI2UNIT)
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
endif
|
|
|
ifeq ($(CPU_UNITS_DEFINED),)
|
|
|
@@ -974,7 +976,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
|
|
|
endif
|
|
|
endif
|
|
|
ifeq ($(ARCH),avr)
|
|
|
-CPU_SPECIFIC_COMMON_UNITS=intrinsics
|
|
|
+CPU_SPECIFIC_COMMON_UNITS=$(INTRINSICSUNIT)
|
|
|
ifeq ($(SUBARCH),avrtiny)
|
|
|
CPU_UNITS=attiny4 attiny5 attiny9 attiny10 attiny20 attiny40 attiny102 attiny104
|
|
|
CPU_UNITS_DEFINED=1
|
|
|
@@ -1109,7 +1111,7 @@ $(error No CPUs enabled for given SUBARCH, pass either a SUBARCH or set CPU_UNIT
|
|
|
endif
|
|
|
endif
|
|
|
ifeq ($(ARCH),riscv32)
|
|
|
-CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
|
|
|
+CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT) $(INTRINSICSUNIT)
|
|
|
ifeq ($(SUBARCH),rv32ec)
|
|
|
override FPCOPT+=-Cprv32ec
|
|
|
CPU_UNITS=CH32VxBootstrap
|
|
|
@@ -3465,8 +3467,6 @@ else
|
|
|
$(addsuffix $(PPUEXT),$(CPU_UNITS)):
|
|
|
$(COMPILER) -g -Fi$(OSDIR) -Fi$(OSDIR)/$(ARCH) $<
|
|
|
endif
|
|
|
-intrinsics$(PPUEXT): $(PROCINC)/intrinsics.pp $(SYSTEMUNIT)$(PPUEXT)
|
|
|
- $(COMPILER) $<
|
|
|
avrsim$(PPUEXT): $(ARCH)/avrsim.pp $(HEAPMGRUNIT)$(PPUEXT) $(CONSOLEIOUNIT)$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
|
|
|
$(COMPILER) $(ARCH)/avrsim.pp
|
|
|
MULTIBOOT_DEPS = $(ARCH)/multiboot.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) \
|
Pierre Muller