Browse Source

Add intrinsics unit to CPU_SPECIFIC_COMMON_UNITS make variable instead of resetting it

Pierre Muller 5 days ago
parent
commit
481d7ac6ff
2 changed files with 6 additions and 6 deletions
  1. 3 3
      rtl/embedded/Makefile
  2. 3 3
      rtl/embedded/Makefile.fpc

+ 3 - 3
rtl/embedded/Makefile

@@ -936,12 +936,12 @@ SYSUTILS_DEPS_OS=$(HEAPMGRUNIT)$(PPUEXT)
 DOSDIR=.
 DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
 ifeq ($(ARCH),aarch64)
-CPU_SPECIFIC_COMMON_UNITS=$(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)
+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) \
@@ -976,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=$(INTRINSICSUNIT)
+CPU_SPECIFIC_COMMON_UNITS+=$(INTRINSICSUNIT)
 ifeq ($(SUBARCH),avrtiny)
 CPU_UNITS=attiny4 attiny5 attiny9 attiny10 attiny20 attiny40 attiny102 attiny104
 CPU_UNITS_DEFINED=1

+ 3 - 3
rtl/embedded/Makefile.fpc

@@ -68,13 +68,13 @@ DOSDIR=.
 DOS_DEPS_OS=$(OBJPASUNIT)$(PPUEXT)
 
 ifeq ($(ARCH),aarch64)
-CPU_SPECIFIC_COMMON_UNITS=$(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)
+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) \
@@ -110,7 +110,7 @@ endif
 endif
 
 ifeq ($(ARCH),avr)
-CPU_SPECIFIC_COMMON_UNITS=$(INTRINSICSUNIT)
+CPU_SPECIFIC_COMMON_UNITS+=$(INTRINSICSUNIT)
 ifeq ($(SUBARCH),avrtiny)
 CPU_UNITS=attiny4 attiny5 attiny9 attiny10 attiny20 attiny40 attiny102 attiny104
 CPU_UNITS_DEFINED=1