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

* complain no matching SUBARCH value is passed, issue #29177

Browse Source 
git-svn-id: trunk@32649 -
This commit is contained in:
florian 2015-12-13 10:41:12 +00:00
parent 5cfdd8fbf5
commit 7b9a257549
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rtl/embedded/Makefile
View File

@ -373,6 +373,9 @@ endif
ifeq ($(SUBARCH),armv7a) ifeq ($(SUBARCH),armv7a)
CPU_UNITS=allwinner_a20 CPU_UNITS=allwinner_a20
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),avr) ifeq ($(ARCH),avr)
ifeq ($(SUBARCH),avr25) ifeq ($(SUBARCH),avr25)
@ -407,16 +410,25 @@ endif
ifeq ($(SUBARCH),avr6) ifeq ($(SUBARCH),avr6)
CPU_UNITS=atmega2561 atmega2560 CPU_UNITS=atmega2561 atmega2560
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo
CPU_UNITS=multiboot CPU_UNITS=multiboot
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo
ifeq ($(SUBARCH),pic32mx) ifeq ($(SUBARCH),pic32mx)
CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
OBJPASDIR=$(RTL)/objpas OBJPASDIR=$(RTL)/objpas
GRAPHDIR=$(INC)/graph GRAPHDIR=$(INC)/graph

12
rtl/embedded/Makefile.fpc
View File

@ -81,6 +81,9 @@ endif
ifeq ($(SUBARCH),armv7a) ifeq ($(SUBARCH),armv7a)
CPU_UNITS=allwinner_a20 CPU_UNITS=allwinner_a20
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),avr) ifeq ($(ARCH),avr)
@ -116,11 +119,17 @@ endif
ifeq ($(SUBARCH),avr6) ifeq ($(SUBARCH),avr6)
CPU_UNITS=atmega2561 atmega2560 CPU_UNITS=atmega2561 atmega2560
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlconsts getopts lineinfo
CPU_UNITS=multiboot CPU_UNITS=multiboot
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
ifeq ($(ARCH),mipsel) ifeq ($(ARCH),mipsel)
@ -128,6 +137,9 @@ CPU_SPECIFIC_COMMON_UNITS=sysutils math classes fgl macpas typinfo types rtlcons
ifeq ($(SUBARCH),pic32mx) ifeq ($(SUBARCH),pic32mx)
CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh CPU_UNITS=pic32mx1xxfxxxb pic32mx2xxfxxxb pic32mx1xxfxxxc pic32mx2xxfxxxc pic32mx1xxfxxxd pic32mx2xxfxxxd pic32mx7x5fxxxl pic32mx7x5fxxxh
endif endif
ifeq ($(CPU_UNITS),)
$(error Invalid value set for SUBARCH)
endif
endif endif
# Paths # Paths