sbsv2/raptor/lib/flm/e32abiv2.flm
branchfix
changeset 560 245c03ee6e9c
parent 558 e902bcdd2eef
parent 553 7d4971eaf863
child 561 a50b8a8df628
equal deleted inserted replaced
559:3a62f88a49f8 560:245c03ee6e9c
    47 endif
    47 endif
    48 
    48 
    49 ifeq ($(DOBUILD),1)
    49 ifeq ($(DOBUILD),1)
    50 
    50 
    51 $(if $(FLMDEBUG),$(info <debug><flm name='e32abiv2' target='$(TARGET)' type='$(TARGETTYPE)' outputpath='$(OUTPUTPATH)' metasource='$(METASOURCE)' postlinkfiletype='$(POSTLINKFILETYPE)' /></debug>))
    51 $(if $(FLMDEBUG),$(info <debug><flm name='e32abiv2' target='$(TARGET)' type='$(TARGETTYPE)' outputpath='$(OUTPUTPATH)' metasource='$(METASOURCE)' postlinkfiletype='$(POSTLINKFILETYPE)' /></debug>))
       
    52 
       
    53 # Enable DELETE_ON_FAILED_COMPILE work around for failed RVCT 2.2 compiles
       
    54 ifneq ($(DELETE_ON_FAILED_COMPILE),)
       
    55 RVCT22_DELETE_WORKAROUND:=|| { $$(GNURM) $$@; exit 1; }
       
    56 endif # ifneq ($(DELETE_ON_FAILED_COMPILE),)
    52 
    57 
    53 # Strip switch-type parameters
    58 # Strip switch-type parameters
    54 #
    59 #
    55 POSTLINKTARGETTYPE:=$(strip $(POSTLINKTARGETTYPE))
    60 POSTLINKTARGETTYPE:=$(strip $(POSTLINKTARGETTYPE))
    56 TARGETEXT:=$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE))
    61 TARGETEXT:=$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE))
   165   ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),)
   170   ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_DSO)),)
   166     IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso
   171     IMPORTLIBTARGET_DSO:=$(TMP_IMPORTLIBTARGET_ROOT).dso
   167     IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso
   172     IMPORTLIBTARGETVERSIONED_DSO:=$(VER_E32IMPORTLIBBASE).dso
   168   endif
   173   endif
   169 
   174 
   170   # ABIv1 .lib (for specific builds, toolchains and host OS platforms only)
   175   # ABIv1 .lib (for specific kits and toolchains only)
   171   IMPORTLIBTARGET_LIB:=
   176   IMPORTLIBTARGET_LIB:=
   172   IMPORTLIBTARGETVERSIONED_LIB:=
   177   IMPORTLIBTARGETVERSIONED_LIB:=
   173   BUILDMARKER_IMPORTLIBTARGET_LIB:=TARGET_$(subst :,,$(VER_E32IMPORTLIBBASE)).lib
   178   BUILDMARKER_IMPORTLIBTARGET_LIB:=TARGET_$(subst :,,$(VER_E32IMPORTLIBBASE)).lib
   174   # Only for builds that require and support them, and only on windows
   179   # Only for kits that require and tools that support them
   175   ifeq ($(OSTYPE),cygwin)
   180   ifneq ($(SUPPORTS_ABIV1_IMPLIBS),)
   176   ifeq ($(GENERATE_ABIV1_IMPLIBS),1)
       
   177     WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib)
   181     WHATRELEASE:=$(WHATRELEASE) $(if $(EXPLICITVERSION),,$(TMP_IMPORTLIBTARGET_ROOT).lib)
   178     WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib
   182     WHATRELEASE:=$(WHATRELEASE) $(VER_E32IMPORTLIBBASE).lib
   179     ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),)
   183     ifeq ($($(BUILDMARKER_IMPORTLIBTARGET_LIB)),)
   180       IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib
   184       IMPORTLIBTARGET_LIB:=$(TMP_IMPORTLIBTARGET_ROOT).lib
   181       IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib
   185       IMPORTLIBTARGETVERSIONED_LIB:=$(VER_E32IMPORTLIBBASE).lib
   182     endif
   186     endif
   183   endif
       
   184   endif
   187   endif
   185 endif
   188 endif
   186 
   189 
   187 # Try to make sure that we get the right linkas name
   190 # Try to make sure that we get the right linkas name
   188 # If linkas is specified then split it up and
   191 # If linkas is specified then split it up and
   793 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   796 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   794 			$(if $(NOHIDEALL),--no_hide_all,) \
   797 			$(if $(NOHIDEALL),--no_hide_all,) \
   795 			$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(1).d)) \
   798 			$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(1).d)) \
   796 			$(if $(LINKERFEEDBACK_STAGE2),$(FEEDBACK_OPTION)$(call dblquote,$(FEEDBACKFILE))) \
   799 			$(if $(LINKERFEEDBACK_STAGE2),$(FEEDBACK_OPTION)$(call dblquote,$(FEEDBACKFILE))) \
   797 			$(if $(MULTIFILE_ENABLED),--multifile $(OUTPUT_OPTION) $(MULTIFILEOBJECT) \
   800 			$(if $(MULTIFILE_ENABLED),--multifile $(OUTPUT_OPTION) $(MULTIFILEOBJECT) \
   798 			--via $$(call dblquote, $(MULTIFILE_VIAFILE)),$(OUTPUT_OPTION) $$@ $$(call dblquote, $$<))  \
   801 			--via $$(call dblquote, $(MULTIFILE_VIAFILE)),$(OUTPUT_OPTION) $$@ $$(call dblquote, $$<)) $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
   799 	$(call endrule,compile)
   802 	$(call endrule,compile)
   800 
   803 
   801 ifeq ($(NO_DEPEND_GENERATE),)
   804 ifeq ($(NO_DEPEND_GENERATE),)
   802   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
   805   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
   803 endif
   806 endif
   852 			$(if $(SET_ARMINC),$(if $(RVCTINC),$(COMPILER_SYSTEM_INCLUDE_OPTION)$(call dblquote,$(RVCTINC)),),)       \
   855 			$(if $(SET_ARMINC),$(if $(RVCTINC),$(COMPILER_SYSTEM_INCLUDE_OPTION)$(call dblquote,$(RVCTINC)),),)       \
   853 			$(COMPILER_SYSTEM_INCLUDE_OPTION)$$(call dblquote,$$(<D))                                                   \
   856 			$(COMPILER_SYSTEM_INCLUDE_OPTION)$$(call dblquote,$$(<D))                                                   \
   854 			$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(USERINCLUDE)))      \
   857 			$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(USERINCLUDE)))      \
   855 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   858 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   856 			$(if $(NOHIDEALL),--no_hide_all,) \
   859 			$(if $(NOHIDEALL),--no_hide_all,) \
   857 			$$(call dblquote, $$<) $(OUTPUT_OPTION) $$(@) \
   860 			$$(call dblquote, $$<) $(OUTPUT_OPTION) $$(@) $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
   858 	$(call endrule,e32cpponly)
   861 	$(call endrule,e32cpponly)
   859 
   862 
   860 CLEANTARGETS:=$$(CLEANTARGETS) $(CPPONLYTARGET)
   863 CLEANTARGETS:=$$(CLEANTARGETS) $(CPPONLYTARGET)
   861 endef
   864 endef
   862 
   865 
   887 			$(COMPILER_SYSTEM_INCLUDE_OPTION)$$(call dblquote,$$(<D))                                                   \
   890 			$(COMPILER_SYSTEM_INCLUDE_OPTION)$$(call dblquote,$$(<D))                                                   \
   888 			$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(USERINCLUDE)))      \
   891 			$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(USERINCLUDE)))      \
   889 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   892 			$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$(call dblquote,$(SYSTEMINCLUDE)))  \
   890 			$(if $(NOHIDEALL),--no_hide_all,) \
   893 			$(if $(NOHIDEALL),--no_hide_all,) \
   891 			$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(DEPENDFILENAME))) \
   894 			$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(DEPENDFILENAME))) \
   892 			$$(call dblquote, $$<) $(OUTPUT_OPTION) $$(@) \
   895 			$$(call dblquote, $$<) $(OUTPUT_OPTION) $$(@) $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
   893 	$(call endrule,e32listing)
   896 	$(call endrule,e32listing)
   894 
   897 
   895 CLEANTARGETS:=$$(CLEANTARGETS) $(LISTINGTARGET)
   898 CLEANTARGETS:=$$(CLEANTARGETS) $(LISTINGTARGET)
   896 
   899 
   897 ifeq ($(NO_DEPEND_GENERATE),))
   900 ifeq ($(NO_DEPEND_GENERATE),))
   982 			$(if $(LTCG),$(LTCG_OPTION),) \
   985 			$(if $(LTCG),$(LTCG_OPTION),) \
   983 			$(OPTION_COMPILER) \
   986 			$(OPTION_COMPILER) \
   984 			$(call makemacrodef,-D,$(COMPILER_INTERWORK_DEFINES) $(CDEFS) $(CIADEFS)) $(CPP_LANG_OPTION)      \
   987 			$(call makemacrodef,-D,$(COMPILER_INTERWORK_DEFINES) $(CDEFS) $(CIADEFS)) $(CPP_LANG_OPTION)      \
   985 	 		$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(USERINCLUDE)))     \
   988 	 		$(if $(USERINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(USERINCLUDE)))     \
   986 	 		$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(SYSTEMINCLUDE))) \
   989 	 		$(if $(SYSTEMINCLUDE),$(COMPILER_SYSTEM_INCLUDE_OPTION),)$$(call concat, $(COMPILER_SYSTEM_INCLUDE_OPTION),$$(call dblquote,$(SYSTEMINCLUDE))) \
   987 	 		$$(call dblquote, $$<) $(OUTPUT_OPTION) $$@ \
   990 	 		$$(call dblquote, $$<) $(OUTPUT_OPTION) $$@ $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
   988 	$(call endrule,cia2cpp2o)
   991 	$(call endrule,cia2cpp2o)
   989 
   992 
   990 
   993 
   991 # preprocessed CIA file to a CPP file
   994 # preprocessed CIA file to a CPP file
   992 $(e32abiv2_CPPFILE): $(e32abiv2_PREFILE)
   995 $(e32abiv2_CPPFILE): $(e32abiv2_PREFILE)
  1008 
  1011 
  1009 
  1012 
  1010 $(e32abiv2_PREFILE): $1 $(PROJECT_META) $(if $(DEPENDFILE),,RESOURCE BITMAP EXPORT)
  1013 $(e32abiv2_PREFILE): $1 $(PROJECT_META) $(if $(DEPENDFILE),,RESOURCE BITMAP EXPORT)
  1011 	$(call startrule,cia2cpp,,$1) \
  1014 	$(call startrule,cia2cpp,,$1) \
  1012 	$(if $(PERTURBSTARTTIME),$(RANSLEEP) $(PERTURBMSECS) ;,) \
  1015 	$(if $(PERTURBSTARTTIME),$(RANSLEEP) $(PERTURBMSECS) ;,) \
  1013 	$(CC) $(e32abiv2_PREFILE_OPTIONS) $(OUTPUT_OPTION) $$@ $$(call dblquote,$1) \
  1016 	$(CC) $(e32abiv2_PREFILE_OPTIONS) $(OUTPUT_OPTION) $$@ $$(call dblquote,$1) $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
  1014 	$(if $(NO_DEPEND_GENERATE),,&& $(CC) -M $(e32abiv2_PREFILE_OPTIONS) --depend_format=unix $(OUTPUT_OPTION) $$@ $$(call dblquote,$1) > $(call dblquote,$(e32abiv2_PREFILE).d)) \
  1017 	$(if $(NO_DEPEND_GENERATE),,&& $(CC) -M $(e32abiv2_PREFILE_OPTIONS) --depend_format=unix $(OUTPUT_OPTION) $$@ $$(call dblquote,$1) > $(call dblquote,$(e32abiv2_PREFILE).d)) \
  1015 	$(call endrule,cia2cpp)
  1018 	$(call endrule,cia2cpp)
  1016 
  1019 
  1017 ifeq ($(NO_DEPEND_GENERATE),)
  1020 ifeq ($(NO_DEPEND_GENERATE),)
  1018   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
  1021   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
  1053 $(1): $(2) $(PROJECT_META) $(if $(DEPENDFILE),,RESOURCE BITMAP EXPORT)
  1056 $(1): $(2) $(PROJECT_META) $(if $(DEPENDFILE),,RESOURCE BITMAP EXPORT)
  1054 	$(call startrule,asmcompile,,$(2)) \
  1057 	$(call startrule,asmcompile,,$(2)) \
  1055 		$(if $(PERTURBSTARTTIME),$(RANSLEEP) $(PERTURBMSECS) ;,) \
  1058 		$(if $(PERTURBSTARTTIME),$(RANSLEEP) $(PERTURBMSECS) ;,) \
  1056 		$(CC) $(e32abiv2_asm_OPTIONS) \
  1059 		$(CC) $(e32abiv2_asm_OPTIONS) \
  1057 		$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(DEPENDFILENAME))) \
  1060 		$(if $(NO_DEPEND_GENERATE),,$(DEPEND_OPTION) $(call dblquote,$(DEPENDFILENAME))) \
  1058 	 	$$(call dblquote, $$<) $(OUTPUT_OPTION) $$@ \
  1061 	 	$$(call dblquote, $$<) $(OUTPUT_OPTION) $$@ $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
  1059 	$(call endrule,asmcompile)
  1062 	$(call endrule,asmcompile)
  1060 ifeq ($(NO_DEPEND_GENERATE),)
  1063 ifeq ($(NO_DEPEND_GENERATE),)
  1061 	$(call startrule,asmdependencies) \
  1064 	$(call startrule,asmdependencies) \
  1062 		$(CC) -M $(subst --no_rtti,,$(e32abiv2_asm_OPTIONS)) --depend_format=unix \
  1065 		$(CC) -M $(subst --no_rtti,,$(e32abiv2_asm_OPTIONS)) --depend_format=unix \
  1063 	  	$(OUTPUT_OPTION) $$@ $$(call dblquote,$2) > $(call dblquote,$(DEPENDFILENAME)) \
  1066 	  	$(OUTPUT_OPTION) $$@ $$(call dblquote,$2) > $(call dblquote,$(DEPENDFILENAME)) $(if $(USE_RVCT22_DELETE_WORKAROUND),$(RVCT22_DELETE_WORKAROUND)) \
  1064 	$(call endrule,asmdependencies)
  1067 	$(call endrule,asmdependencies)
  1065 endif
  1068 endif
  1066 
  1069 
  1067 ifeq ($(NO_DEPEND_GENERATE),)
  1070 ifeq ($(NO_DEPEND_GENERATE),)
  1068   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)
  1071   CLEANTARGETS:=$$(CLEANTARGETS) $(DEPENDFILENAME)