| branch | fix |
| changeset 520 | e5a5f48080cc |
| parent 516 | cd8318d5fb3a |
| child 522 | 9971c248e894 |
| 496:50b7c0278040 | 520:e5a5f48080cc |
|---|---|
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 |
52 |
53 # Strip switch-type parameters |
53 # Strip switch-type parameters |
54 # |
54 # |
55 POSTLINKTARGETTYPE:=$(strip $(POSTLINKTARGETTYPE)) |
55 POSTLINKTARGETTYPE:=$(strip $(POSTLINKTARGETTYPE)) |
56 TARGETEXT:=$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)) |
|
57 |
|
56 UID1:=$(strip $(UID1)) |
58 UID1:=$(strip $(UID1)) |
57 UID2:=$(strip $(UID2)) |
59 UID2:=$(strip $(UID2)) |
58 UID3:=$(strip $(UID3)) |
60 UID3:=$(strip $(UID3)) |
59 SID:=$(strip $(SECUREID)) |
61 SID:=$(strip $(SECUREID)) |
60 VENDORID:=$(strip $(VENDORID)) |
62 VENDORID:=$(strip $(VENDORID)) |
126 VER_E32IMPORTLIBBASE:=$(IMPORTLIBPATH)/$(EXPORTLIBRARY){$(VERSIONHEX)} |
128 VER_E32IMPORTLIBBASE:=$(IMPORTLIBPATH)/$(EXPORTLIBRARY){$(VERSIONHEX)} |
127 endif |
129 endif |
128 |
130 |
129 # Postlinkable targets need to be linked and elf2e32'd |
131 # Postlinkable targets need to be linked and elf2e32'd |
130 ifneq ($(DOPOSTLINK),) |
132 ifneq ($(DOPOSTLINK),) |
131 E32TARGET:=$(RELEASABLEPATH)/$(TARGET)$(if $(EXPLICITVERSION),{$(VERSIONHEX)},).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)) |
133 E32TARGET:=$(RELEASABLEPATH)/$(TARGET)$(if $(EXPLICITVERSION),{$(VERSIONHEX)},).$(TARGETEXT) |
132 LINK_TARGET:=$(RELEASABLEPATH)/$(TARGET)$(if $(EXPLICITVERSION),{$(VERSIONHEX)},).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)).sym |
134 LINK_TARGET:=$(RELEASABLEPATH)/$(TARGET)$(if $(EXPLICITVERSION),{$(VERSIONHEX)},).$(TARGETEXT).sym |
133 MAPFILE:=$(RELEASABLEPATH)/$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)).map |
135 MAPFILE:=$(RELEASABLEPATH)/$(TARGET).$(TARGETEXT).map |
134 else |
136 else |
135 E32TARGET:= |
137 E32TARGET:= |
136 LINK_TARGET:= |
138 LINK_TARGET:= |
137 MAPFILE:= |
139 MAPFILE:= |
138 endif |
140 endif |
185 # Try to make sure that we get the right linkas name |
187 # Try to make sure that we get the right linkas name |
186 # If linkas is specified then split it up and |
188 # If linkas is specified then split it up and |
187 # put the hex version number in the right place |
189 # put the hex version number in the right place |
188 ifeq ($(LINKAS),) |
190 ifeq ($(LINKAS),) |
189 LINKASNAME=$(TARGET) |
191 LINKASNAME=$(TARGET) |
190 LINKASTYPE=$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)) |
192 LINKASTYPE=$(TARGETEXT) |
191 else |
193 else |
192 SPLIT_LINKAS=$(subst ., ,$(LINKAS)) |
194 SPLIT_LINKAS=$(subst ., ,$(LINKAS)) |
193 LINKASNAME=$(word 1,$(SPLIT_LINKAS)) |
195 LINKASNAME=$(word 1,$(SPLIT_LINKAS)) |
194 LINKASTYPE=$(word 2,$(SPLIT_LINKAS)) |
196 LINKASTYPE=$(word 2,$(SPLIT_LINKAS)) |
195 endif |
197 endif |
710 endif |
712 endif |
711 |
713 |
712 # USE_TRACE_COMPILER defaults to blank in Raptor config. |
714 # USE_TRACE_COMPILER defaults to blank in Raptor config. |
713 # Users can turn TC on by setting it to 1 in user config. |
715 # Users can turn TC on by setting it to 1 in user config. |
714 ifneq ($(USE_TRACE_COMPILER),) |
716 ifneq ($(USE_TRACE_COMPILER),) |
717 # TARGETEXT is already set |
|
715 include $(FLMHOME)/tracecompiler.mk |
718 include $(FLMHOME)/tracecompiler.mk |
716 WHATRELEASE:=$(WHATRELEASE) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER) |
719 WHATRELEASE:=$(WHATRELEASE) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER) |
720 ifneq ($(TRACE_PATH),) |
|
721 CDEFS:=$(CDEFS) OST_TRACE_COMPILER_IN_USE |
|
722 endif |
|
717 endif |
723 endif |
718 |
724 |
719 CC_CPPONLY_ARGS:=$(SYMBIAN_CCFLAGS) $(if $(DEBUG_INFO),-g) $(DEBUG_FORMAT) \ |
725 CC_CPPONLY_ARGS:=$(SYMBIAN_CCFLAGS) $(if $(DEBUG_INFO),-g) $(DEBUG_FORMAT) \ |
720 $(RUNTIME_SYMBOL_VISIBILITY_OPTION) $(EXCEPTIONS) \ |
726 $(RUNTIME_SYMBOL_VISIBILITY_OPTION) $(EXCEPTIONS) \ |
721 $(CC_WARNINGS_CONTROL_OPTION) $(CC_ERRORS_CONTROL_OPTION) \ |
727 $(CC_WARNINGS_CONTROL_OPTION) $(CC_ERRORS_CONTROL_OPTION) \ |
862 endif |
868 endif |
863 |
869 |
864 define e32abiv2_listing |
870 define e32abiv2_listing |
865 # $1 is the sourcefile |
871 # $1 is the sourcefile |
866 |
872 |
867 $(eval LISTINGTARGET:=$(strip $(call extractandmap,$(CPPFILEEXTENSIONS) $(CFILEEXTENSIONS),.$(subst _,.,$(call sanitise,$(FULLVARIANTPATH))).$(TARGET).$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE)).lst,$1))) |
873 $(eval LISTINGTARGET:=$(strip $(call extractandmap,$(CPPFILEEXTENSIONS) $(CFILEEXTENSIONS),.$(subst _,.,$(call sanitise,$(FULLVARIANTPATH))).$(TARGET).$(TARGETEXT).lst,$1))) |
868 $(eval DEPENDFILENAME:=$(call map2listfile,$1).d) |
874 $(eval DEPENDFILENAME:=$(call map2listfile,$1).d) |
869 $(eval DEPENDFILE:=$(wildcard $(DEPENDFILENAME))) |
875 $(eval DEPENDFILE:=$(wildcard $(DEPENDFILENAME))) |
870 |
876 |
871 |
877 |
872 LISTING:: $(LISTINGTARGET) |
878 LISTING:: $(LISTINGTARGET) |
918 # Fivespaces variable created to ensure a suitable gap of space characters |
924 # Fivespaces variable created to ensure a suitable gap of space characters |
919 # Is placed between the separate arguments. This fixes a problem in Cygwin, where |
925 # Is placed between the separate arguments. This fixes a problem in Cygwin, where |
920 # separate arguments are interpreted as a single argument when passed to bash |
926 # separate arguments are interpreted as a single argument when passed to bash |
921 FIVESPACES=$(BLANK) $(BLANK) |
927 FIVESPACES=$(BLANK) $(BLANK) |
922 |
928 |
923 FREEZEGUARD:=TARGET_$(TARGET)_$(if $(REQUESTEDTARGETEXT),$(REQUESTEDTARGETEXT),$(POSTLINKFILETYPE))_$(IMPORTLIBPATH)_EFREEZE |
929 FREEZEGUARD:=TARGET_$(TARGET)_$(TARGETEXT)_$(IMPORTLIBPATH)_EFREEZE |
924 |
930 |
925 define e32freeze |
931 define e32freeze |
926 |
932 |
927 FREEZE:: $(1) |
933 FREEZE:: $(1) |
928 $(call startrule,freeze,,$(RESOLVED_DEFFILE)) \ |
934 $(call startrule,freeze,,$(RESOLVED_DEFFILE)) \ |