--- a/sbsv2/raptor/lib/config/arm.xml Wed Jul 28 13:20:46 2010 +0100
+++ b/sbsv2/raptor/lib/config/arm.xml Thu Aug 12 09:00:16 2010 +0100
@@ -18,9 +18,20 @@
<env name="SBSV1MAKE" default="$(EPOCROOT)/epoc32/tools/make$(DOTEXE)" type="tool"/>
<env name="STRINGTABLE" default="$(PERL) $(EPOCROOT)/epoc32/tools/stringtable.pl" type="script"/>
<env name="TRANASM" default="$(PERL) $(EPOCROOT)/epoc32/tools/tranasm.pl" type="script"/>
-
+
+ <set name="BASE_ARCH" value="arm"/>
+ <set name="POSTLINKER" value="$(ELF2E32)"/>
+ <set name="IMPLIBTOOL" value="$(ELF2E32)"/>
+ <set name="DEFGENTOOL" value="$(ELF2E32)"/>
+
+ <!-- targettypes -->
+ <set name="TARGET_TYPES" value="ani dll exe exexp fsy implib kdll kexe kext klib ldd lib pdd pdl pdll plugin plugin3 stddll stdexe stdlib textnotifier2 var var2 none"/>
+
<!-- interfaces -->
+ <append name="INTERFACE_TYPES" value="$(TARGET_TYPES)"/>
+
<set name="INTERFACE.extension" value="Symbian.extension"/>
+ <set name="INTERFACE.kexe" value="Symbian.kexe"/>
<!-- macros -->
<set name="ARMMACROS.CONFIG" value=""/>
@@ -38,11 +49,13 @@
<set name="CODE_SEGMENT_START" value=""/>
<set name="DEFAULT_STDCPP_NEWLIB" value="stdnew.dso"/>
<set name="DEFAULT_SYMBIAN_NEWLIB" value="scppnwdl.dso"/>
- <set name="DUMPBCINFO" value=""/>
<set name="EPOCSTACKSIZE" value=""/>
+ <set name="FIX_EXPORTS_USING_EXP_FILE" value=""/>
<set name="FULLVARIANTPATH" value="$(VARIANTPLATFORM)/$(VARIANTTYPE)"/>
<set name="HEADER_FILES_CONTROL_OPTION" value=""/>
+ <set name="IMPLIB_EXTENSION" value="dso"/>
<set name="LIBRARY_DEBUG" value=""/>
+ <set name="LINKER_ENTRYPOINT_PREFIX" value="_"/>
<set name="MMPDEFS" value=""/>
<set name="NMAKE" value="nmake"/>
<set name="NMAKEFLAGS" value="-nologo -x - "/>
@@ -56,19 +69,18 @@
<set name="POSTLINKER_FPU_MAPPING" value="softvfp>softvfp vfpv2>vfpv2 softvfp+vfpv2>vfpv2"/>
<set name="RELEASEPATH" value="$(EPOCROOT)/epoc32/release"/>
<set name="RESOLVED_DEFFILE" value=""/>
+ <set name="RESOLVED_DEFFILE_SECONDARY" value=""/>
<set name="RUNTIME_LIBS_PATH" value="$(EPOCROOT)/epoc32/release/armv5/lib"/>
<set name="SID" value=""/>
<set name="STATIC_LIBRARY_DIR" value="$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)"/>
<set name="STATIC_RUNTIME_DIR" value="$(EPOCROOT)/epoc32/release/$(VARIANTPLATFORM)/$(VARIANTTYPE)"/>
<set name="SYMBIAN_CC_MESSAGE_OPTION" value="$(CC_WARNINGS_CONTROL_OPTION) $(CC_ERRORS_CONTROL_OPTION)"/>
- <set name="SYMBIAN_DLL_DEFINITION" value="__DLL__"/>
- <set name="SYMBIAN_EXE_DEFINITION" value="__EXE__"/>
<set name="SYMBIAN_LINK_FLAGS" value="$(SYMBIAN_LD_MESSAGE_OPTION) $(BPABI_OPTION) $(RELOCATABLE_IMAGE_OPTION) $(UNRESOLVED_SYMBOL_REF_OPTION) $(STDLIB_OPTION) $(EXTRA_LD_OPTION) $(SYMBIAN_LINK_FLAGS.CONFIG) $(SYMBIAN_LINK_FLAGS.VAR)"/>
<set name="SYMBIAN_LINK_FLAGS.CONFIG" value=""/>
<set name="SYMBIAN_LINK_FLAGS.VAR" value=""/>
<set name="SYSTEMINCLUDE" value=""/>
<set name="TARGET" value=""/>
- <set name="UNIX_SLASH_FOR_CC_ABS_PATHS" value="0"/>
+ <set name="TREAT_EXES_AS_SHARED" value="1"/>
<set name="UNRESOLVED_SYMBOL_REF_OPTION" value=""/>
</var>
@@ -135,8 +147,8 @@
<alias name="armv6_urel" meaning="arm.v6.urel.rvct2_2"/>
<alias name="armv6_udeb" meaning="arm.v6.udeb.rvct2_2"/>
- <alias name="armv7_urel" meaning="arm.v7.urel.rvct3_1"/>
- <alias name="armv7_udeb" meaning="arm.v7.udeb.rvct3_1"/>
+ <alias name="armv7_urel" meaning="arm.v7.urel.rvct4_0"/>
+ <alias name="armv7_udeb" meaning="arm.v7.udeb.rvct4_0"/>
<alias name="arm9e_urel" meaning="arm.9e.urel.rvct2_2"/>
<alias name="arm9e_udeb" meaning="arm.9e.udeb.rvct2_2"/>