Parcourir la source

* arm-embedded requires sub-arch to be passed

git-svn-id: trunk@18845 -
florian il y a 14 ans
Parent
commit
8eafefc90f
2 fichiers modifiés avec 198 ajouts et 182 suppressions
  1. 189 180
      utils/fpcm/fpcmake.inc
  2. 9 2
      utils/fpcm/fpcmake.ini

Fichier diff supprimé car celui-ci est trop grand
+ 189 - 180
utils/fpcm/fpcmake.inc


+ 9 - 2
utils/fpcm/fpcmake.ini

@@ -272,6 +272,15 @@ ARCH=$(CPU_TARGET)
 endif
 endif
 endif
 endif
 
 
+ifeq ($(CPU_TARGET),arm)
+ifeq ($(OS_TARGET),embedded)
+ifeq ($(SUBARCH),)
+# we don't add a default here, people should explicitly add the SUBARCH
+$(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=arm7 or SUBARCH=cortexm3) must be defined)
+endif
+endif
+endif
+
 # Full name of the target, including CPU and OS. For OSs limited
 # Full name of the target, including CPU and OS. For OSs limited
 # to 8.3 we only use the target OS
 # to 8.3 we only use the target OS
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
@@ -1024,8 +1033,6 @@ SHAREDLIBEXT=.so
 SHORTSUFFIX=wii
 SHORTSUFFIX=wii
 endif
 endif
 
 
-endif
-
 # For 8.3 limited OS's the short suffixes
 # For 8.3 limited OS's the short suffixes
 # Otherwise use the full source/target names
 # Otherwise use the full source/target names
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
 ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff