--- a/sbsv2/raptor/lib/config/gcce.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/config/gcce.xml Mon Nov 30 18:04:21 2009 +0000
@@ -10,7 +10,7 @@
<set name="ASM" value="$(GCCEASM)"/>
<set name="AR" value="$(GCCEAR)"/>
<set name="GCCECC" value="$(GCCEBIN)/arm-none-symbianelf-g++$(DOTEXE)"/>
- <set name="GCCELD" value="$(GCCEBIN)/arm-none-symbianelf-ld$(DOTEXE)"/>
+ <set name="GCCELD" value="$(GCCEBIN)/arm-none-symbianelf-g++$(DOTEXE)"/>
<set name="GCCEASM" value="$(GCCEBIN)/arm-none-symbianelf-as$(DOTEXE)"/>
<set name="GCCEAR" value="$(GCCEBIN)/arm-none-symbianelf-ar$(DOTEXE)"/>
<set name="FROMELF" value="$(GCCEBIN)/arm-none-symbianelf-readelf$(DOTEXE)"/>
@@ -33,16 +33,17 @@
<set name="EXTRA_LD_OPTION" value=""/>
<set name="FPMODE_OPTION" value=""/>
<set name="LD_ERRORS_CONTROL_OPTION" value=""/>
- <set name="LD_WARNINGS_CONTROL_OPTION" value="--no-undefined"/>
+ <set name="LD_WARNINGS_CONTROL_OPTION" value="-Wl,--no-undefined"/>
<set name="LISTING_OPTION" value="-S"/>
<set name="EXCEPTIONS" value="-fexceptions"/>
<set name="NO_EXCEPTIONS" value="-fno-exceptions"/>
<set name="PREINCLUDE_OPTION" value="-include"/>
<set name="PREPROCESSOR_OPTION" value="-E"/>
<set name="REL_OPTIMISATION" value="-O2"/>
- <set name="STDLIB_OPTION" value="-nostdlib"/>
+ <set name="STDLIB_OPTION" value="-nodefaultlibs"/>
<set name="RUNTIME_SYMBOL_VISIBILITY_OPTION" value=""/>
- <set name="RW_BASE_OPTION" value="-Tdata"/>
+ <set name="RW_BASE_OPTION" value="-Wl,-Tdata,"/>
+ <set name="RW_BASE" value="$(RW_BASE_OPTION)0x400000"/>
<set name="CODE_SEGMENT_START" value="-Ttext"/>
<set name="PREINCLUDE" value="$(EPOCINCLUDE)/gcce/gcce.h"/>
<!-- From the GCC manual: "With this option, GCC uses features of DWARF version 3 when they are useful; ..." -->
@@ -72,24 +73,24 @@
<set name="LINKER_DEBUG_OPTION" value=""/>
<!-- Clearly the linker libs stuff following isn't right - need to use ARMLIBS (or reinvent this a bit) -->
<set name="LINKER_DEFAULT_LIBS" value="-lsupc++ -lgcc"/>
- <set name="LINKER_DEFAULT_LIB_PATHS" value="-L $(GCCEBIN)/../lib/gcc/arm-none-symbianelf/$(TOOLCHAINVERSION) -L $(GCCEBIN)/../lib/gcc/arm-none-symbianelf/$(TOOLCHAINVERSION)/../../../../arm-none-symbianelf/lib"/>
- <set name="LINKER_ENTRY_OPTION" value="--entry"/>
+ <set name="LINKER_DEFAULT_LIB_PATHS" value=""/>
+ <set name="LINKER_ENTRY_OPTION" value="-Wl,--entry"/>
<set name="LINKER_GROUP_START_OPTION" value="--start-group"/>
<set name="LINKER_GROUP_END_OPTION" value="--end-group"/>
- <set name="LINKER_MISC_FLAGS" value="$(CODE_SEGMENT_START) 0x8000"/>
- <set name="LINKER_NODEBUG_OPTION" value = "--strip-debug"/>
+ <set name="LINKER_MISC_FLAGS" value="-Wl,$(CODE_SEGMENT_START),0x8000"/>
+ <set name="LINKER_NODEBUG_OPTION" value = "-Wl,--strip-debug"/>
<set name="LINKER_SCRIPT_FILE_OPTION" value="-T"/>
- <set name="LINKER_SYMBOLS_OPTION" value="-Map"/>
- <set name="LINKER_SYMBOLS_FILE_OPTION" value=""/>
- <set name="SHARED_OBJECT_OPTION" value="-shared"/>
+ <set name="LINKER_SYMBOLS_OPTION" value=""/>
+ <set name="LINKER_SYMBOLS_FILE_OPTION" value="-Wl,-Map"/>
+ <set name="SHARED_OBJECT_OPTION" value="-Wl,-shared"/>
<set name="SID" value=""/>
- <set name="SO_NAME_OPTION" value="-soname"/>
+ <set name="SO_NAME_OPTION" value="-Wl,-soname"/>
<set name="STATIC_LIBS_PATH" value="" />
<set name="STDCPP_INCLUDE" value="$(EPOCINCLUDE)/stdapis"/>
<set name="SUPPORTS_ABIV1_IMPLIBS" value=""/>
<set name="SYMBIAN_LD_MESSAGE_OPTION" value="$(LD_WARNINGS_CONTROL_OPTION) $(LD_ERRORS_CONTROL_OPTION)"/>
<set name="TARGET_RELOCATION_OPTION" value="--target1-rel" />
- <set name="SYMVER_OPTION" value="--default-symver"/>
+ <set name="SYMVER_OPTION" value="-Wl,--default-symver"/>
<set name="TEMP_FILES_OPTION" value="-pipe"/>
<set name="THUMB_INSTRUCTION_SET" value="-mthumb"/>
<set name="TRANSFORM_CIA" value=""/>
--- a/sbsv2/raptor/lib/config/rvct.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/config/rvct.xml Mon Nov 30 18:04:21 2009 +0000
@@ -42,7 +42,8 @@
<set name="REL_OPTIMISATION" value="-O2"/>
<set name="STDLIB_OPTION" value="--no_scanlib"/>
<set name="RUNTIME_SYMBOL_VISIBILITY_OPTION" value="--dllimport_runtime"/>
- <set name="RW_BASE_OPTION" value="--rw-base"/>
+ <set name="RW_BASE_OPTION" value="--rw-base" />
+ <set name="RW_BASE" value="$(RW_BASE_OPTION) 0x400000"/>
<set name="CODE_SEGMENT_START" value=""/>
<set name="PREINCLUDE" value="$(RVCT_PRE_INCLUDE)"/>
<set name="CC.DWARF2" value="--dwarf2"/>
@@ -75,7 +76,7 @@
<set name="LINKER_MISC_FLAGS" value="$(LICENSERETRY_OPTION)"/>
<set name="LINKER_NODEBUG_OPTION" value=""/>
<set name="LINKER_SCRIPT_FILE_OPTION" value=""/>
- <set name="LINKER_SYMBOLS_OPTION" value="--symbols"/>
+ <set name="LINKER_SYMBOLS_OPTION" value="--symbols"/>
<set name="LINKER_SYMBOLS_FILE_OPTION" value="--list"/>
<set name="SHARED_OBJECT_OPTION" value="--dll"/>
<set name="SID" value=""/>
--- a/sbsv2/raptor/lib/config/variants.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml Mon Nov 30 18:04:21 2009 +0000
@@ -1,256 +1,270 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
- <!-- Commonly used variants.
-
- These can be referenced from the command-line or in configurations.
-
- -->
-
- <!-- This variant turns debug info on for arm only -->
- <var name="debug_info">
- <set name='DEBUG_INFO' value='1'/>
- </var>
-
- <!-- Run this variant to turn on trace compiler -->
- <var name="tracecompiler">
- <set name='USE_TRACE_COMPILER' value='1'/>
- <env name='JAVA_HOME' default='' type='path'/>
- <env name='SBS_JAVATC' default='$(JAVA_HOME)/bin/java.exe' type='tool' versionCommand='$(SBS_JAVATC) -version' versionResult='version \"1\.[5-9]' host='win*' />
- <env name='SBS_JAVATC' default='$(JAVA_HOME)/bin/java' type='tool' versionCommand='$(SBS_JAVATC) -version' versionResult='version \"1\.[5-9]' host='lin*' />
- </var>
-
- <!-- Overrides the default debugging format for the ARM targets. -->
- <var name="dwarf3">
- <set name="DEBUG_FORMAT" value="$(CC.DWARF3)"/>
- </var>
-
- <var name="techview">
- </var>
-
- <var name="test">
- <set name='TESTCODE' value='TRUE'/>
- </var>
-
- <var name="savespace">
- <set name='SAVESPACE' value='TRUE'/>
- </var>
-
- <var name="generate_linkerfeedback">
- <set name='GENERATELINKERFEEDBACK' value='TRUE'/>
- </var>
-
- <var name="use_linkerfeedback">
- <set name='GENERATELINKERFEEDBACK' value='TRUE'/>
- <set name='LINKERFEEDBACK_STAGE2' value='TRUE'/>
- </var>
-
- <var name="profilerfeedback">
- <set name='USE_PROFILER_FEEDBACK' value='TRUE'/>
- <env name='ARM_PROFILER_FILE' default='' type='path'/>
- </var>
-
- <var name="ltcg">
- <set name='LTCG' value='TRUE'/>
- <set name='LTCG_OPTION' value='--ltcg'/>
- </var>
-
- <var name="multifile">
- <set name='MULTIFILE_ENABLED' value='TRUE'/>
- </var>
-
- <!-- build from clean can skip some processing -->
- <var name="bfc">
- <set name='DEPEND_SKIP' value='TRUE'/>
- </var>
-
- <!-- SMP variant for Kernel Code -->
- <var name="smp">
- <append name="CDEFS" value="__SMP__"/>
- <append name="PLATMACROS.WINDOWS" value="SMP"/>
- <!-- PLATMACROS.LINUX is set from PLATMACROS.WINDOWS -->
- <append name="TRADITIONAL_PLATFORM" value='SMP' separator="" />
- <append name="VARIANTPLATFORM" value="smp" separator=""/>
- <set name="GENERATE_ABIV1_IMPLIBS" value=""/>
- </var>
-
- <!-- emit formatted releasable information into the logs for post-build parsing -->
- <var name="whatlog">
- <set name='WHATLOG' value='TRUE'/>
- </var>
-
- <var name="gcce4_3_2" extends="gcce_base">
- <env name="GCCEBIN" type="path" />
- <env name="GCCEVERSION" default="$(TOOLCHAINVERSION)" />
- <set name="TOOLCHAINVERSION" value="4.3.2" />
- <set name="OWN_LIBRARY_OPTION" value=""/>
- <set name="STATIC_LIBS_LIST" value=""/>
- <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
- <set name="ARMLIBS" value=""/>
- <set name="CC.SOFTVFP_MAYBE_VFPV2" value="soft"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV3" value="soft"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
- <set name="CC.ARMV5" value="-march=armv5t"/>
- <set name="CC.ARMV6" value="-march=armv6t2"/>
- <set name="CC.ARMV7" value="-march=armv7"/>
- <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
- <set name="RVCTLIB" value=""/>
- <set name="CC.NO_UNALIGNED_ACCESS" value=""/>
- <set name="SPLIT_OPTION" value=""/>
- <set name="NEED_ENTRYPOINT_LIBRARY" value=""/>
- <set name="RVCTBIN" value="" />
- <set name="RVCTINC" value="" />
- <set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
- <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
- <set name="NEED_ENTRYPOINT_LIBRARY" value="" />
- <set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_3"/>
- <set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_3__"/>
- </var>
-
- <var name="gcce4_3_3" extends="gcce4_3_2">
- <set name="TOOLCHAINVERSION" value="4.3.3" />
- </var>
-
- <var name="gcce4_4_1" extends="gcce4_3_3">
- <set name="TOOLCHAINVERSION" value="4.4.1" />
- <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso"/>
- <set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_4"/>
- <set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_4__"/>
- </var>
-
- <var name="rvct2_2" extends="rvct">
- <env name="RVCT22BIN" type="path"/>
- <env name="RVCT22INC" type="path"/>
- <env name="RVCT22LIB" type="path"/>
- <set name="RVCTBIN" value="$(RVCT22BIN)"/>
- <set name="RVCTINC" value="$(RVCT22INC)"/>
- <set name="RVCTLIB" value="$(RVCT22LIB)"/>
- <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --vsn" versionResult="Compiler, RVCT2\.2\b"/>
- <set name="OWN_LIBRARY_OPTION" value="-Ono_known_library"/>
- <set name="RELOCATABLE_IMAGE_OPTION" value="--reloc"/>
- <set name="SPLIT_OPTION" value="--split"/>
- <set name="PLATMACROS.VAR" value="ARMCC_2 ARMCC_2_2"/>
- <set name="ARMMACROS.VAR" value="__ARMCC_2__ __ARMCC_2_2__"/>
- <set name="SYMBIAN_LINK_FLAGS.VAR" value=""/>
- <set name="STATIC_LIBS_LIST" value="h_t__uf.l(switch8.o)"/>
- <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct2_2.dso drtrvct2_2.dso"/>
- <set name="USER_STATIC_RUNTIME_LIB" value="usrt2_2.lib"/>
- <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt2_2.lib"/>
- <set name="USRTLIB" value="usrt2_2.lib"/>
- <set name="NEED_ENTRYPOINT_LIBRARY" value="False"/>
- <set name="CC.NO_UNALIGNED_ACCESS" value="--memaccess -UL41"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
- <set name="CC.ARMV5" value="--cpu 5T"/>
- <set name="CC.ARMV6" value="--cpu 6"/>
- </var>
-
- <var name="rvct3_1" extends="rvct">
- <env name="RVCT31BIN" type="path"/>
- <env name="RVCT31INC" type="path"/>
- <env name="RVCT31LIB" type="path"/>
- <set name="RVCTBIN" value="$(RVCT31BIN)"/>
- <set name="RVCTINC" value="$(RVCT31INC)"/>
- <set name="RVCTLIB" value="$(RVCT31LIB)"/>
- <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --version_number" versionResult="310[6-9]\d\d\b"/>
- <set name="OWN_LIBRARY_OPTION" value="--library_interface=aeabi_clib"/>
- <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
- <set name="SPLIT_OPTION" value=""/>
- <set name="PLATMACROS.VAR" value="ARMCC_3 ARMCC_3_1"/>
- <set name="ARMMACROS.VAR" value="__ARMCC_3__ __ARMCC_3_1__"/>
- <set name="SYMBIAN_LINK_FLAGS.VAR" value="--export_all"/>
- <set name="STATIC_LIBS_LIST" value="h_5.l"/>
- <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
- <set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
- <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
- <set name="USRTLIB" value="usrt3_1.lib"/>
- <set name="NEED_ENTRYPOINT_LIBRARY" value="True"/>
- <set name="CC.NO_UNALIGNED_ACCESS" value="--no_unaligned_access"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
- <set name="CC.ARMV5" value="--cpu 5TE"/>
- <set name="CC.ARMV6" value="--cpu 6"/>
- <set name="CC.ARMV7" value="--cpu 7-A"/>
- </var>
-
- <var name="rvct4_0" extends="rvct">
- <env name="RVCT40BIN" type="path"/>
- <env name="RVCT40INC" type="path"/>
- <env name="RVCT40LIB" type="path"/>
- <set name="RVCTBIN" value="$(RVCT40BIN)"/>
- <set name="RVCTINC" value="$(RVCT40INC)"/>
- <set name="RVCTLIB" value="$(RVCT40LIB)"/>
- <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --version_number" versionResult="400[4-9]\d\d\b"/>
- <set name="OWN_LIBRARY_OPTION" value="--library_interface=aeabi_clib"/>
- <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
- <set name="SPLIT_OPTION" value=""/>
- <set name="STDLIB_OPTION" value=""/>
- <set name="PLATMACROS.VAR" value="ARMCC_4 ARMCC_4_0"/>
- <set name="ARMMACROS.VAR" value="__ARMCC_4__ __ARMCC_4_0__"/>
- <set name="SYMBIAN_LINK_FLAGS.VAR" value="--override_visibility"/>
- <set name="STATIC_LIBS_LIST" value=""/>
- <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso"/>
- <set name="USER_STATIC_RUNTIME_LIB" value="usrt4_0.lib"/>
- <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt4_0.lib"/>
- <set name="USRTLIB" value="usrt4_0.lib"/>
- <set name="NEED_ENTRYPOINT_LIBRARY" value="True"/>
- <set name="CC.NO_UNALIGNED_ACCESS" value="--no_unaligned_access"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp+vfpv2"/>
- <set name="PL.SOFTVFP_MAYBE_VFPV2" value="vfpv2"/>
- <set name="CC.SOFTVFP_MAYBE_VFPV3" value="softvfp+vfpv3"/>
- <!-- Not supported yet : <set name="PL.SOFTVFP_MAYBE_VFPV3" value="vfpv3"/> -->
- <set name="PL.SOFTVFP_MAYBE_VFPV3" value="vfpv2"/>
- <set name="CC.ARMV5" value="--cpu 5TE"/>
- <set name="CC.ARMV6" value="--cpu 6"/>
- <set name="CC.ARMV7" value="--cpu 7-A"/>
- </var>
-
- <var name="urel">
- <set name="DEBUG_INFO" value=""/>
- <set name="SYMBIAN_CCFLAGS" value="$(REL_OPTIMISATION)"/>
- <set name="VARIANTTYPE" value="urel"/>
- <append name="CDEFS" value="NDEBUG"/>
- </var>
-
- <var name="udeb">
- <set name="DEBUG_INFO" value="1"/>
- <set name="SYMBIAN_CCFLAGS" value="$(DEBUG_OPTIMISATION)"/>
- <set name="VARIANTTYPE" value="udeb"/>
- <append name="CDEFS" value="_DEBUG"/>
- </var>
-
- <var name="remove_freeze">
- <set name='EFREEZE_REMOVE_OPTION' value='-Remove'/>
- </var>
-
- <!-- OS variant mechanism is now deprecated. We retain the values for
- versions older than TB92sf until the mechanism is removed. -->
-
- <!-- variant for OS version v9.4 -->
- <var name="v94">
- <set name='POSTLINKER_SUPPORTS_WDP' value=''/>
- <set name='SUPPORTS_STDCPP_NEWLIB' value=''/>
- <set name='RVCT_PRE_INCLUDE' value='$(EPOCINCLUDE)/rvct2_2/rvct2_2.h'/>
- </var>
-
- <!-- variants for OS version TB91* (the same as OS v9.4) -->
- <var name="vtb91" extends="v94"/>
- <var name="vtb91sf" extends="v94"/>
-
- <!-- these OS variants are deliberately empty -->
- <var name="v95"/>
- <var name="v96"/>
- <var name="vFuture"/>
- <var name="vtb92"/>
- <var name="vtb92sf"/>
- <var name="vtb101"/>
- <var name="vtb101sf"/>
-
- <!-- WINSCW specific variant for pick up nested relative include headers correctly -->
- <var name="mwccinc">
- <set name='OPTION_CW' value='-cwd include'/>
- </var>
-
-</build>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<build xmlns="http://symbian.com/xml/build" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symbian.com/xml/build ../../schema/build/2_0.xsd">
+ <!-- Commonly used variants.
+
+ These can be referenced from the command-line or in configurations.
+
+ -->
+
+ <!-- This variant turns debug info on for arm only -->
+ <var name="debug_info">
+ <set name='DEBUG_INFO' value='1'/>
+ </var>
+
+ <!-- Run this variant to turn on trace compiler -->
+ <var name="tracecompiler">
+ <set name='USE_TRACE_COMPILER' value='1'/>
+ <env name='JAVA_HOME' default='' type='path'/>
+ <env name='SBS_JAVATC' default='$(JAVA_HOME)/bin/java.exe' type='tool' versionCommand='$(SBS_JAVATC) -version' versionResult='version \"1\.[5-9]' host='win*' />
+ <env name='SBS_JAVATC' default='$(JAVA_HOME)/bin/java' type='tool' versionCommand='$(SBS_JAVATC) -version' versionResult='version \"1\.[5-9]' host='lin*' />
+ </var>
+
+ <!-- Overrides the default debugging format for the ARM targets. -->
+ <var name="dwarf3">
+ <set name="DEBUG_FORMAT" value="$(CC.DWARF3)"/>
+ </var>
+
+ <var name="techview">
+ </var>
+
+ <var name="test">
+ <set name='TESTCODE' value='TRUE'/>
+ </var>
+
+ <var name="savespace">
+ <set name='SAVESPACE' value='TRUE'/>
+ </var>
+
+ <var name="generate_linkerfeedback">
+ <set name='GENERATELINKERFEEDBACK' value='TRUE'/>
+ </var>
+
+ <var name="use_linkerfeedback">
+ <set name='GENERATELINKERFEEDBACK' value='TRUE'/>
+ <set name='LINKERFEEDBACK_STAGE2' value='TRUE'/>
+ </var>
+
+ <var name="profilerfeedback">
+ <set name='USE_PROFILER_FEEDBACK' value='TRUE'/>
+ <env name='ARM_PROFILER_FILE' default='' type='path'/>
+ </var>
+
+ <var name="ltcg">
+ <set name='LTCG' value='TRUE'/>
+ <set name='LTCG_OPTION' value='--ltcg'/>
+ </var>
+
+ <var name="multifile">
+ <set name='MULTIFILE_ENABLED' value='TRUE'/>
+ </var>
+
+ <!-- build from clean can skip some processing -->
+ <var name="bfc">
+ <set name='DEPEND_SKIP' value='TRUE'/>
+ </var>
+
+ <!-- SMP variant for Kernel Code -->
+ <var name="smp">
+ <append name="CDEFS" value="__SMP__"/>
+ <append name="PLATMACROS.WINDOWS" value="SMP"/>
+ <!-- PLATMACROS.LINUX is set from PLATMACROS.WINDOWS -->
+ <append name="TRADITIONAL_PLATFORM" value='SMP' separator="" />
+ <append name="VARIANTPLATFORM" value="smp" separator=""/>
+ <set name="GENERATE_ABIV1_IMPLIBS" value=""/>
+ </var>
+
+ <!-- emit formatted releasable information into the logs for post-build parsing -->
+ <var name="whatlog">
+ <set name='WHATLOG' value='TRUE'/>
+ </var>
+
+ <var name="gcce4_3_2" extends="gcce_base">
+ <env name="SBS_GCCE432BIN" type="path" />
+ <set name="GCCEBIN" value="$(SBS_GCCE432BIN)" />
+ <set name="OWN_LIBRARY_OPTION" value=""/>
+ <set name="STATIC_LIBS_LIST" value=""/>
+ <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
+ <set name="ARMLIBS" value=""/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV2" value="soft"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV3" value="soft"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
+ <set name="CC.ARMV5" value="-march=armv5t"/>
+ <set name="CC.ARMV6" value="-march=armv6t2"/>
+ <set name="CC.ARMV7" value="-march=armv7"/>
+ <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
+ <set name="RVCTLIB" value=""/>
+ <set name="CC.NO_UNALIGNED_ACCESS" value=""/>
+ <set name="SPLIT_OPTION" value=""/>
+ <set name="NEED_ENTRYPOINT_LIBRARY" value=""/>
+ <set name="RVCTBIN" value="" />
+ <set name="RVCTINC" value="" />
+ <set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
+ <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
+ <set name="NEED_ENTRYPOINT_LIBRARY" value="" />
+ <set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_3"/>
+ <set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_3__"/>
+ </var>
+
+ <var name="gcce4_3_3" extends="gcce4_3_2">
+ <env name="SBS_GCCE433BIN" type="path" />
+ <set name="GCCEBIN" value="$(SBS_GCCE433BIN)" />
+ </var>
+
+ <var name="gcce4_4_1" extends="gcce4_3_3">
+ <env name="SBS_GCCE441BIN" type="path" />
+ <set name="GCCEBIN" value="$(SBS_GCCE441BIN)" />
+ <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso"/>
+ <set name="PLATMACROS.VAR" value="GCCE_4 GCCE_4_4"/>
+ <set name="ARMMACROS.VAR" value="__GCCE_4__ __GCCE_4_4__"/>
+ </var>
+
+ <var name="rvct2_2" extends="rvct">
+ <env name="RVCT22BIN" type="path"/>
+ <env name="RVCT22INC" type="path"/>
+ <env name="RVCT22LIB" type="path"/>
+ <set name="RVCTBIN" value="$(RVCT22BIN)"/>
+ <set name="RVCTINC" value="$(RVCT22INC)"/>
+ <set name="RVCTLIB" value="$(RVCT22LIB)"/>
+ <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --vsn" versionResult="Compiler, RVCT2\.2\b"/>
+ <set name="OWN_LIBRARY_OPTION" value="-Ono_known_library"/>
+ <set name="RELOCATABLE_IMAGE_OPTION" value="--reloc"/>
+ <set name="SPLIT_OPTION" value="--split"/>
+ <set name="PLATMACROS.VAR" value="ARMCC_2 ARMCC_2_2"/>
+ <set name="ARMMACROS.VAR" value="__ARMCC_2__ __ARMCC_2_2__"/>
+ <set name="SYMBIAN_LINK_FLAGS.VAR" value=""/>
+ <set name="STATIC_LIBS_LIST" value="h_t__uf.l(switch8.o)"/>
+ <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct2_2.dso drtrvct2_2.dso"/>
+ <set name="USER_STATIC_RUNTIME_LIB" value="usrt2_2.lib"/>
+ <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt2_2.lib"/>
+ <set name="USRTLIB" value="usrt2_2.lib"/>
+ <set name="NEED_ENTRYPOINT_LIBRARY" value="False"/>
+ <set name="CC.NO_UNALIGNED_ACCESS" value="--memaccess -UL41"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+ <set name="CC.ARMV5" value="--cpu 5T"/>
+ <set name="CC.ARMV6" value="--cpu 6"/>
+ </var>
+
+ <var name="rvct3_1" extends="rvct">
+ <env name="RVCT31BIN" type="path"/>
+ <env name="RVCT31INC" type="path"/>
+ <env name="RVCT31LIB" type="path"/>
+ <set name="RVCTBIN" value="$(RVCT31BIN)"/>
+ <set name="RVCTINC" value="$(RVCT31INC)"/>
+ <set name="RVCTLIB" value="$(RVCT31LIB)"/>
+ <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --version_number" versionResult="310[6-9]\d\d\b"/>
+ <set name="OWN_LIBRARY_OPTION" value="--library_interface=aeabi_clib"/>
+ <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
+ <set name="SPLIT_OPTION" value=""/>
+ <set name="PLATMACROS.VAR" value="ARMCC_3 ARMCC_3_1"/>
+ <set name="ARMMACROS.VAR" value="__ARMCC_3__ __ARMCC_3_1__"/>
+ <set name="SYMBIAN_LINK_FLAGS.VAR" value="--export_all"/>
+ <set name="STATIC_LIBS_LIST" value="h_5.l"/>
+ <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso dfprvct3_1.dso drtrvct3_1.dso"/>
+ <set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
+ <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt3_1.lib"/>
+ <set name="USRTLIB" value="usrt3_1.lib"/>
+ <set name="NEED_ENTRYPOINT_LIBRARY" value="True"/>
+ <set name="CC.NO_UNALIGNED_ACCESS" value="--no_unaligned_access"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV2" value="softvfp"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV3" value="softvfp"/>
+ <set name="CC.ARMV5" value="--cpu 5TE"/>
+ <set name="CC.ARMV6" value="--cpu 6"/>
+ <set name="CC.ARMV7" value="--cpu 7-A"/>
+ </var>
+
+ <var name="rvct4_0" extends="rvct">
+ <env name="RVCT40BIN" type="path"/>
+ <env name="RVCT40INC" type="path"/>
+ <env name="RVCT40LIB" type="path"/>
+ <set name="RVCTBIN" value="$(RVCT40BIN)"/>
+ <set name="RVCTINC" value="$(RVCT40INC)"/>
+ <set name="RVCTLIB" value="$(RVCT40LIB)"/>
+ <set name="ARMCC" value=""$(RVCTBIN)/armcc$(DOTEXE)"" type="tool" versionCommand="$(ARMCC) --version_number" versionResult="400[4-9]\d\d\b"/>
+ <set name="OWN_LIBRARY_OPTION" value="--library_interface=aeabi_clib"/>
+ <set name="RELOCATABLE_IMAGE_OPTION" value=""/>
+ <set name="SPLIT_OPTION" value=""/>
+ <set name="STDLIB_OPTION" value=""/>
+ <set name="PLATMACROS.VAR" value="ARMCC_4 ARMCC_4_0"/>
+ <set name="ARMMACROS.VAR" value="__ARMCC_4__ __ARMCC_4_0__"/>
+ <set name="SYMBIAN_LINK_FLAGS.VAR" value="--override_visibility"/>
+ <set name="STATIC_LIBS_LIST" value=""/>
+ <set name="RUNTIME_LIBS_LIST" value="drtaeabi.dso dfpaeabi.dso"/>
+ <set name="USER_STATIC_RUNTIME_LIB" value="usrt4_0.lib"/>
+ <set name="KERNEL_STATIC_RUNTIME_LIB" value="ksrt4_0.lib"/>
+ <set name="USRTLIB" value="usrt4_0.lib"/>
+ <set name="NEED_ENTRYPOINT_LIBRARY" value="True"/>
+ <set name="CC.NO_UNALIGNED_ACCESS" value="--no_unaligned_access"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV2" value="softvfp+vfpv2"/>
+ <set name="PL.SOFTVFP_MAYBE_VFPV2" value="vfpv2"/>
+ <set name="CC.SOFTVFP_MAYBE_VFPV3" value="softvfp+vfpv3"/>
+ <!-- Not supported yet : <set name="PL.SOFTVFP_MAYBE_VFPV3" value="vfpv3"/> -->
+ <set name="PL.SOFTVFP_MAYBE_VFPV3" value="vfpv2"/>
+ <set name="CC.ARMV5" value="--cpu 5TE"/>
+ <set name="CC.ARMV6" value="--cpu 6"/>
+ <set name="CC.ARMV7" value="--cpu 7-A"/>
+ </var>
+
+ <var name="urel">
+ <set name="DEBUG_INFO" value=""/>
+ <set name="SYMBIAN_CCFLAGS" value="$(REL_OPTIMISATION)"/>
+ <set name="VARIANTTYPE" value="urel"/>
+ <append name="CDEFS" value="NDEBUG"/>
+ </var>
+
+ <var name="udeb">
+ <set name="DEBUG_INFO" value="1"/>
+ <set name="SYMBIAN_CCFLAGS" value="$(DEBUG_OPTIMISATION)"/>
+ <set name="VARIANTTYPE" value="udeb"/>
+ <append name="CDEFS" value="_DEBUG"/>
+ </var>
+
+ <var name="remove_freeze">
+ <set name='EFREEZE_REMOVE_OPTION' value='-Remove'/>
+ </var>
+
+ <!-- OS variant mechanism is now deprecated. We retain the values for
+ versions older than TB92sf until the mechanism is removed. -->
+
+ <!-- variant for OS version v9.4 -->
+ <var name="v94">
+ <set name='POSTLINKER_SUPPORTS_WDP' value=''/>
+ <set name='SUPPORTS_STDCPP_NEWLIB' value=''/>
+ <set name='RVCT_PRE_INCLUDE' value='$(EPOCINCLUDE)/rvct2_2/rvct2_2.h'/>
+ </var>
+
+ <!-- variants for OS version TB91* (the same as OS v9.4) -->
+ <var name="vtb91" extends="v94"/>
+ <var name="vtb91sf" extends="v94"/>
+
+ <!-- these OS variants are deliberately empty -->
+ <var name="v95"/>
+ <var name="v96"/>
+ <var name="vFuture"/>
+ <var name="vtb92"/>
+ <var name="vtb92sf"/>
+ <var name="vtb101"/>
+ <var name="vtb101sf"/>
+
+ <!-- WINSCW specific variant for pick up nested relative include headers correctly -->
+ <var name="mwccinc">
+ <set name='OPTION_CW' value='-cwd include'/>
+ </var>
+
+ <!-- Variant to allow GCCE-built binaries to be created in epoc32/release/gcce,
+ epoc32/release/gccev6 and epoc32/release/gccev7 -->
+ <var name="release_gcce">
+ <set name="VARIANTPLATFORM" value="gcce" />
+ <set name="STATIC_RUNTIME_DIR" value="$(EPOCROOT)/epoc32/release/armv5/$(VARIANTTYPE)"/>
+ <set name="STATIC_LIBRARY_DIR" value="$(EPOCROOT)/epoc32/release/armv5/$(VARIANTTYPE)"/>
+ </var>
+ <var name="release_gccev6" extends="release_gcce" >
+ <set name="VARIANTPLATFORM" value="gccev6" />
+ </var>
+ <var name="release_gccev7" extends="release_gcce" >
+ <set name="VARIANTPLATFORM" value="gccev7" />
+ </var>
+</build>
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm Mon Nov 30 18:04:21 2009 +0000
@@ -595,14 +595,13 @@
$(LD) $(LINKER_MISC_FLAGS) $(LINKER_DEFAULT_LIB_PATHS) $(SYMBIAN_LINK_FLAGS) $(if $(DEBUG_INFO),$(LINKER_DEBUG_OPTION),$(LINKER_NODEBUG_OPTION)) \
$(if $(ARMLIBS),$(LD_WARNINGS_SUPPRESSION_ARMLIBS),) \
$(SHARED_OBJECT_OPTION) $(SPLIT_OPTION) \
- $(RW_BASE_OPTION) 0x400000 \
+ $(RW_BASE) \
$(LINKER_ARCH_OPTION) \
- $(SYMVER_OPTION) $(SO_NAME_OPTION) $(call dblquote,$(LINKASVERSIONED)) \
+ $(SYMVER_OPTION) $(SO_NAME_OPTION)=$(call dblquote,$(LINKASVERSIONED)) \
$(LINKER_ENTRYPOINT_SETTING) \
-o $$(call dblquote,$$@) \
$(if $(LTCG),$(LTCG_OPTION),) \
- $(LINKER_SYMBOLS_OPTION) $(LINKER_SYMBOLS_FILE_OPTION) \
- $(call dblquote,$(MAPFILE)) \
+ $(LINKER_SYMBOLS_OPTION) $(LINKER_SYMBOLS_FILE_OPTION)=$(call dblquote,$(MAPFILE)) \
$(LINKEROPTION) \
$(if $(MULTIFILE_ENABLED),$(call dblquote,$(MULTIFILEOBJECT) $(CIAFILES_LINKOBJECTS)),$(COMMANDFILE_OPTION)$(call dblquote,$(VIAFILE))) \
$(if $(GENERATELINKERFEEDBACK),$(FEEDBACK_OPTION)$(call dblquote,$(FEEDBACKFILE))) \
--- a/sbsv2/raptor/lib/flm/e32abiv2ani.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2ani.flm Mon Nov 30 18:04:21 2009 +0000
@@ -29,7 +29,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Nov 30 18:04:21 2009 +0000
@@ -40,13 +40,17 @@
# Reset these variables as they change for every single target type
# LINKER_ENTRYPOINT_ADORNMENT will be blank for GCCE; for RVCT it will look like "(uc_exe_.o)"
# LINKER_ENTRYPOINT_DECORATION will be blank for RVCT; for GCCE it will look like "-u _E32Startup"
+# LINKER_SEPARATOR is a comma for GCCE as g++ is used for linking; for RVCT is should be a space, but
+# as make strips trailing spaces, we use the CHAR_SPACE variable.
LINKER_ENTRYPOINT_ADORNMENT:=
LINKER_ENTRYPOINT_DECORATION:=
+LINKER_SEPARATOR:=
# For GCCE
ifeq ($(TOOLCHAIN),GCCE)
-LINKER_ENTRYPOINT_DECORATION:=$(if $(call isoneof,$(TARGETTYPE),exexp exe),-u _E32Startup,-u _E32Dll)
+LINKER_ENTRYPOINT_DECORATION:=$(if $(call isoneof,$(TARGETTYPE),exexp exe),-Wl$(CHAR_COMMA)-u$(CHAR_COMMA)_E32Startup,-Wl$(CHAR_COMMA)-u$(CHAR_COMMA)_E32Dll)
+LINKER_SEPARATOR:=$(CHAR_COMMA)
endif
# For RVCT
@@ -74,6 +78,7 @@
ifeq ($(TARGETTYPE),kdll)
LINKER_ENTRYPOINT_ADORNMENT:=(L_ENTRY_.o)
endif
+LINKER_SEPARATOR:=$(CHAR_SPACE)
endif
# "OPTION" metadata from the front-end can potentially be supplied simultaneously for both GCCE and RVCT,
--- a/sbsv2/raptor/lib/flm/e32abiv2dll.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2dll.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
# Default Linker settings for this target type
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2exe.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2exe.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
LINKER_STUB_LIBRARY:=
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib)
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib)$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/$(if $(FIRSTLIB),$(FIRSTLIB),eexe.lib)$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Mon Nov 30 18:04:21 2009 +0000
@@ -52,10 +52,10 @@
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)
ifeq ("$(TOOLCHAIN)","RVCT")
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)($(FIRSTLIB_OBJECTFILE)))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB)($(FIRSTLIB_OBJECTFILE)))
else
# GCCE
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup -u _E32Startup $(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup -Wl,-u$(LINKER_SEPARATOR)_E32Startup$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/$(FIRSTLIB))
endif
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
--- a/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
# Determine what kind of entrypoint option to set
AUTOEXPORTS:=CreateFileSystem,1;
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2kdll.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2kdll.flm Mon Nov 30 18:04:21 2009 +0000
@@ -27,7 +27,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/ekll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/ekll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/ekll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2kext.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2kext.flm Mon Nov 30 18:04:21 2009 +0000
@@ -34,7 +34,7 @@
# Default Linker settings for this target type
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/eext.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/eext.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/eext.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2ldd.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2ldd.flm Mon Nov 30 18:04:21 2009 +0000
@@ -29,7 +29,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edev.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2pdd.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2pdd.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edev.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edev.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Mon Nov 30 18:04:21 2009 +0000
@@ -31,7 +31,7 @@
# Default Linker settings for this target type
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Mon Nov 30 18:04:21 2009 +0000
@@ -29,7 +29,7 @@
# Default Linker settings for this target type
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
DEFAULT_NEWLIB:=$(DEFAULT_STDCPP_NEWLIB)
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
--- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
# Determine what kind of entrypoint option to set
LINKER_STUB_LIBRARY:=
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/eexe.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Startup $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/eexe.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Startup $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/eexe.lib$(LINKER_ENTRYPOINT_ADORNMENT))
DEFAULT_NEWLIB:=$(DEFAULT_STDCPP_NEWLIB)
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
--- a/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Mon Nov 30 18:04:21 2009 +0000
@@ -28,7 +28,7 @@
AUTOEXPORTS:=_Z13NotifierArrayv,1;
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/edll.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION))$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/edll.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2var.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2var.flm Mon Nov 30 18:04:21 2009 +0000
@@ -29,7 +29,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/evar.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/e32abiv2var2.flm Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2var2.flm Mon Nov 30 18:04:21 2009 +0000
@@ -29,7 +29,7 @@
# Determine what kind of entrypoint option to set
LINKER_ENTRYPOINT_LIBDEP:=$(STATIC_RUNTIME_DIR)/evar.lib
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION) _E32Dll $(LINKER_ENTRYPOINT_DECORATION) $(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRY_OPTION)=_E32Dll $(LINKER_ENTRYPOINT_DECORATION)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/evar.lib$(LINKER_ENTRYPOINT_ADORNMENT))
ifeq ("$(NEED_ENTRYPOINT_LIBRARY)","True")
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
--- a/sbsv2/raptor/lib/flm/standard.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/lib/flm/standard.xml Mon Nov 30 18:04:21 2009 +0000
@@ -73,7 +73,6 @@
<param name='CC.VAL.SOFTVFP_MAYBE_VFPV2' default=''/>
<param name='CODE_SEGMENT_START' default=''/>
<param name='TOOLCHAIN' default=''/>
- <param name='TOOLCHAINVERSION' default=''/>
</interface>
<interface name="Symbian.e32abiv2" extends="Symbian.mmp" flm="e32abiv2.flm">
<param name='SUPPORTS_STDCPP_NEWLIB' default='1'/>
@@ -163,6 +162,7 @@
<param name='RVCTBIN'/>
<param name='RVCTINC'/>
<param name='RVCTLIB'/>
+ <param name='RW_BASE'/>
<param name='RW_BASE_OPTION'/>
<param name='SBSV1MAKE'/>
<param name='NMAKE'/>
--- a/sbsv2/raptor/python/raptor.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/python/raptor.py Mon Nov 30 18:04:21 2009 +0000
@@ -575,10 +575,16 @@
def SetExportOnly(self, TrueOrFalse):
self.doExportOnly = TrueOrFalse
+ if not self.doExport:
+ self.Error("The --noexport and --export-only options are incompatible - won't to do anything useful")
+ return False
return True
def SetNoExport(self, TrueOrFalse):
self.doExport = not TrueOrFalse
+ if self.doExportOnly:
+ self.Error("The --noexport and --export-only options are incompatible - won't to do anything useful")
+ return False
return True
def SetNoBuild(self, TrueOrFalse):
--- a/sbsv2/raptor/test/common/raptor_tests.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/common/raptor_tests.py Mon Nov 30 18:04:21 2009 +0000
@@ -100,8 +100,14 @@
except OSError, error:
pass
else:
- (comIn, comOut) = os.popen4("which " + input_file)
- output = comOut.read()
+ whichproc = subprocess.Popen(args=["which", input_file],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ shell=False,
+ universal_newlines=True)
+ output = whichproc.stdout.readlines()
+ whichproc.wait()
+
if len(output) > 0:
locations.append(output[0:(len(output) - 1)])
--- a/sbsv2/raptor/test/config/apply_test_variants.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/config/apply_test_variants.xml Mon Nov 30 18:04:21 2009 +0000
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<build xmlns="http://symbian.com/xml/build"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
-
- <!-- These variants are used to test the APPLY keyword -->
-
- <var name="apply_test_append_cdefs">
- <append name="CDEFS" value="APPLYTESTAPPENDCDEFS" />
- </var>
-
-</build>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<build xmlns="http://symbian.com/xml/build"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
+
+ <!-- These variants are used to test the APPLY keyword -->
+
+ <var name="apply_test_append_cdefs">
+ <append name="CDEFS" value="APPLYTESTAPPENDCDEFS" />
+ </var>
+
+</build>
--- a/sbsv2/raptor/test/smoke_suite/dll_armv6.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/dll_armv6.py Mon Nov 30 18:04:21 2009 +0000
@@ -1,68 +1,68 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-from raptor_tests import AntiTargetSmokeTest
-
-def run():
- t = AntiTargetSmokeTest()
-
- rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf"
- targets = [
- "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll.sym",
- "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll.sym",
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso",
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso",
- "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll",
- "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll"
- ]
- antitargets = [
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.lib",
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.lib"
- ]
- buildtargets = [
- "createstaticdll_dll/armv6/udeb/CreateStaticDLL.o",
- "createstaticdll_dll/armv6/urel/CreateStaticDLL.o",
- "createstaticdll_dll/armv6/udeb/armv6_specific.o",
- "createstaticdll_dll/armv6/urel/armv6_specific.o"
- ]
-
- t.id = "0097a"
- t.name = "dll_armv6_rvct"
- t.command = rootcommand + " -c armv6"
- t.targets = targets
- t.antitargets = antitargets
- t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
- t.run()
-
- t.id = "0097b"
- t.name = "dll_armv6_clean"
- t.command = rootcommand + " -c armv6 clean"
- t.targets = []
- t.antitargets = []
- t.run()
-
- t.id = "0097c"
- t.name = "dll_armv6_gcce"
- t.command = rootcommand + " -c arm.v6.udeb.gcce4_3_2 -c arm.v6.urel.gcce4_3_2"
- t.targets = targets
- t.antitargets = antitargets
- t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
- t.run()
-
- t.id = "97"
- t.name = "dll_armv6"
- t.print_result()
- return t
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+from raptor_tests import AntiTargetSmokeTest
+
+def run():
+ t = AntiTargetSmokeTest()
+
+ rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf"
+ targets = [
+ "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll.sym",
+ "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll.sym",
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso",
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso",
+ "$(EPOCROOT)/epoc32/release/armv6/udeb/createstaticdll.dll",
+ "$(EPOCROOT)/epoc32/release/armv6/urel/createstaticdll.dll"
+ ]
+ antitargets = [
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.lib",
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.lib"
+ ]
+ buildtargets = [
+ "createstaticdll_dll/armv6/udeb/CreateStaticDLL.o",
+ "createstaticdll_dll/armv6/urel/CreateStaticDLL.o",
+ "createstaticdll_dll/armv6/udeb/armv6_specific.o",
+ "createstaticdll_dll/armv6/urel/armv6_specific.o"
+ ]
+
+ t.id = "0097a"
+ t.name = "dll_armv6_rvct"
+ t.command = rootcommand + " -c armv6"
+ t.targets = targets
+ t.antitargets = antitargets
+ t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
+ t.run()
+
+ t.id = "0097b"
+ t.name = "dll_armv6_clean"
+ t.command = rootcommand + " -c armv6 clean"
+ t.targets = []
+ t.antitargets = []
+ t.run()
+
+ t.id = "0097c"
+ t.name = "dll_armv6_gcce"
+ t.command = rootcommand + " -c arm.v6.udeb.gcce4_3_2 -c arm.v6.urel.gcce4_3_2"
+ t.targets = targets
+ t.antitargets = antitargets
+ t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
+ t.run()
+
+ t.id = "97"
+ t.name = "dll_armv6"
+ t.print_result()
+ return t
--- a/sbsv2/raptor/test/smoke_suite/dll_armv7.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/dll_armv7.py Mon Nov 30 18:04:21 2009 +0000
@@ -1,61 +1,61 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-from raptor_tests import SmokeTest
-
-def run():
- t = SmokeTest()
-
- rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf"
- targets = [
- "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll.sym",
- "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll.sym",
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso",
- "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso",
- "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll",
- "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll"
- ]
- buildtargets = [
- "createstaticdll_dll/armv7/udeb/CreateStaticDLL.o",
- "createstaticdll_dll/armv7/urel/CreateStaticDLL.o",
- "createstaticdll_dll/armv7/udeb/armv7_specific.o",
- "createstaticdll_dll/armv7/urel/armv7_specific.o"
- ]
-
- t.id = "0011a"
- t.name = "dll_armv7_rvct"
- t.command = rootcommand + " -c armv7"
- t.targets = targets
- t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
- t.run()
-
- t.id = "0011b"
- t.name = "dll_armv7_clean"
- t.command = rootcommand + " -c armv7 clean"
- t.targets = []
- t.run()
-
- t.id = "0011c"
- t.name = "dll_armv7_gcce"
- t.command = rootcommand + " -c arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2"
- t.targets = targets
- t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
- t.run()
-
- t.id = "11"
- t.name = "dll_armv7"
- t.print_result()
- return t
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+from raptor_tests import SmokeTest
+
+def run():
+ t = SmokeTest()
+
+ rootcommand = "sbs -b smoke_suite/test_resources/simple_dll/bld.inf"
+ targets = [
+ "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll.sym",
+ "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll.sym",
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll.dso",
+ "$(EPOCROOT)/epoc32/release/armv5/lib/createstaticdll{000a0000}.dso",
+ "$(EPOCROOT)/epoc32/release/armv7/udeb/createstaticdll.dll",
+ "$(EPOCROOT)/epoc32/release/armv7/urel/createstaticdll.dll"
+ ]
+ buildtargets = [
+ "createstaticdll_dll/armv7/udeb/CreateStaticDLL.o",
+ "createstaticdll_dll/armv7/urel/CreateStaticDLL.o",
+ "createstaticdll_dll/armv7/udeb/armv7_specific.o",
+ "createstaticdll_dll/armv7/urel/armv7_specific.o"
+ ]
+
+ t.id = "0011a"
+ t.name = "dll_armv7_rvct"
+ t.command = rootcommand + " -c armv7"
+ t.targets = targets
+ t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
+ t.run()
+
+ t.id = "0011b"
+ t.name = "dll_armv7_clean"
+ t.command = rootcommand + " -c armv7 clean"
+ t.targets = []
+ t.run()
+
+ t.id = "0011c"
+ t.name = "dll_armv7_gcce"
+ t.command = rootcommand + " -c arm.v7.udeb.gcce4_3_2 -c arm.v7.urel.gcce4_3_2"
+ t.targets = targets
+ t.addbuildtargets("smoke_suite/test_resources/simple_dll/bld.inf", buildtargets)
+ t.run()
+
+ t.id = "11"
+ t.name = "dll_armv7"
+ t.print_result()
+ return t
--- a/sbsv2/raptor/test/smoke_suite/parallel_parsing.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/parallel_parsing.py Mon Nov 30 18:04:21 2009 +0000
@@ -53,7 +53,7 @@
warnings = 0
- t.id = "103"
+ t.id = "104"
t.name = "parallelparsing"
t.description = description
t.command = command
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/apply_test_exported_variants.xml Mon Nov 30 18:04:21 2009 +0000
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<build xmlns="http://symbian.com/xml/build"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
-
- <!-- This variant is used so that we can tell if the APPLY keyword
- can find variants exported into the epoc32 tree -->
-
- <var name="apply_test_exported_var">
- <append name="CDEFS" value="APPLYTESTEXPORTEDVAR" />
- </var>
-
-</build>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<build xmlns="http://symbian.com/xml/build"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://symbian.com/xml/build build/2_0.xsd">
+
+ <!-- This variant is used so that we can tell if the APPLY keyword
+ can find variants exported into the epoc32 tree -->
+
+ <var name="apply_test_exported_var">
+ <append name="CDEFS" value="APPLYTESTEXPORTEDVAR" />
+ </var>
+
+</build>
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/bld.inf Mon Nov 30 18:04:21 2009 +0000
@@ -1,7 +1,7 @@
-
-PRJ_EXPORTS
-apply_test_exported_variants.xml /epoc32/tools/makefile_templates/
-
-PRJ_MMPFILES
-test_mmp_apply.mmp
-
+
+PRJ_EXPORTS
+apply_test_exported_variants.xml /epoc32/tools/makefile_templates/
+
+PRJ_MMPFILES
+test_mmp_apply.mmp
+
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.cpp Mon Nov 30 18:04:21 2009 +0000
@@ -1,9 +1,9 @@
-
-#include "e32def.h"
-
-char test[] = "test mmp keyword APPLY";
-
-TInt E32Main()
-{
- return 0;
-}
+
+#include "e32def.h"
+
+char test[] = "test mmp keyword APPLY";
+
+TInt E32Main()
+{
+ return 0;
+}
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/apply/test_mmp_apply.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,16 +1,16 @@
-
-TARGET test_mmp_apply
-TARGETTYPE EXE
-
-APPLY no_such_var
-
-LIBRARY euser.lib
-
-SYSTEMINCLUDE /epoc32/include
-
-APPLY apply_test_append_cdefs
-
-SOURCE test_mmp_apply.cpp
-
-APPLY apply_test_exported_var
-
+
+TARGET test_mmp_apply
+TARGETTYPE EXE
+
+APPLY no_such_var
+
+LIBRARY euser.lib
+
+SYSTEMINCLUDE /epoc32/include
+
+APPLY apply_test_append_cdefs
+
+SOURCE test_mmp_apply.cpp
+
+APPLY apply_test_exported_var
+
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bld.inf Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-PRJ_PLATFORMS
-ARMV5
-
-PRJ_MMPFILES
-compresstarget.mmp
-nocompresstarget.mmp
-bytepaircompresstarget.mmp
-inflatecompresstarget.mmp
-combinedcompresstarget.mmp
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_MMPFILES
+compresstarget.mmp
+nocompresstarget.mmp
+bytepaircompresstarget.mmp
+inflatecompresstarget.mmp
+combinedcompresstarget.mmp
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/bytepaircompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-TARGET bytepaircompress.exe
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE compress.cpp
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-BYTEPAIRCOMPRESSTARGET
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+TARGET bytepaircompress.exe
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE compress.cpp
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+BYTEPAIRCOMPRESSTARGET
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/combinedcompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,30 +1,30 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-TARGET combinedcompress.exe
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE compress.cpp
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-NOCOMPRESSTARGET
-COMPRESSTARGET
-INFLATECOMPRESSTARGET
-BYTEPAIRCOMPRESSTARGET
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+TARGET combinedcompress.exe
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE compress.cpp
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+NOCOMPRESSTARGET
+COMPRESSTARGET
+INFLATECOMPRESSTARGET
+BYTEPAIRCOMPRESSTARGET
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compress.cpp Mon Nov 30 18:04:21 2009 +0000
@@ -1,22 +1,22 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#include "e32def.h"
-TInt E32Main()
- {
- return 0;
- }
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#include "e32def.h"
+TInt E32Main()
+ {
+ return 0;
+ }
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/compresstarget.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-TARGET compress.exe
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE compress.cpp
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-COMPRESSTARGET
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+TARGET compress.exe
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE compress.cpp
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+COMPRESSTARGET
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/inflatecompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-TARGET inflatecompress.exe
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE compress.cpp
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-INFLATECOMPRESSTARGET
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+TARGET inflatecompress.exe
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE compress.cpp
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+INFLATECOMPRESSTARGET
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp11/nocompresstarget.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-TARGET nocompress.exe
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE compress.cpp
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-NOCOMPRESSTARGET
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+TARGET nocompress.exe
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE compress.cpp
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+NOCOMPRESSTARGET
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu.cpp Mon Nov 30 18:04:21 2009 +0000
@@ -1,27 +1,27 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#include "e32def.h" // intentional include
-
-char test[]="Simple test";
-
-
-TInt test1;
-
-TInt E32Main()
-{
- return 0;
-}
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+#include "e32def.h" // intentional include
+
+char test[]="Simple test";
+
+
+TInt test1;
+
+TInt E32Main()
+{
+ return 0;
+}
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_soft.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,30 +1,30 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-target test_softvfp
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE armfpu.cpp
-
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-ARMFPU softvfp
-
-capability all
-paged
+/*
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+target test_softvfp
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE armfpu.cpp
+
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+ARMFPU softvfp
+
+capability all
+paged
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/armfpu_vfpv2.mmp Mon Nov 30 18:04:21 2009 +0000
@@ -1,30 +1,30 @@
-/*
-* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-target test_vfpv2
-TARGETTYPE exe
-SOURCEPATH .
-SOURCE armfpu.cpp
-
-UID 0x100039ce 0x00000001
-LIBRARY euser.lib
-SECUREID 0x10003a5c
-SYSTEMINCLUDE /epoc32/include
-
-ARMFPU vfpv2
-
-capability all
-paged
+/*
+* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+target test_vfpv2
+TARGETTYPE exe
+SOURCEPATH .
+SOURCE armfpu.cpp
+
+UID 0x100039ce 0x00000001
+LIBRARY euser.lib
+SECUREID 0x10003a5c
+SYSTEMINCLUDE /epoc32/include
+
+ARMFPU vfpv2
+
+capability all
+paged
--- a/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/test_resources/mmp/mmp9_10/bld.inf Mon Nov 30 18:04:21 2009 +0000
@@ -1,26 +1,26 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-PRJ_PLATFORMS
-ARMV5
-
-PRJ_MMPFILES
-armfpu_soft.mmp
-armfpu_vfpv2.mmp
-
-
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+PRJ_PLATFORMS
+ARMV5
+
+PRJ_MMPFILES
+armfpu_soft.mmp
+armfpu_vfpv2.mmp
+
+
--- a/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Sat Nov 28 00:09:57 2009 +0000
+++ b/sbsv2/raptor/test/smoke_suite/toolchain_macros.py Mon Nov 30 18:04:21 2009 +0000
@@ -1,61 +1,60 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-
-from raptor_tests import SmokeTest
-import string
-
-def run():
- t = SmokeTest()
- t.description = "Check that ARM toolchain specific macros are used in both metadata and source processing."
- t.warnings = -1
-
- toolchains = {
- 'rvct2_2': ['ARMCC', 'ARMCC_2', 'ARMCC_2_2', '__ARMCC__', '__ARMCC_2__', '__ARMCC_2_2__'],
- 'rvct3_1': ['ARMCC', 'ARMCC_3', 'ARMCC_3_1', '__ARMCC__', '__ARMCC_3__' , '__ARMCC_3_1__'],
- 'rvct4_0': ['ARMCC', 'ARMCC_4', 'ARMCC_4_0', '__ARMCC__', '__ARMCC_4__' , '__ARMCC_4_0__'],
- 'gcce4_3_2': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__']
-# The following are awaiting easily configurable GCCE version support
-# 'gcce4_3_3': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'],
-# 'gcce4_4_0': ['GCCE', 'GCCE_4', 'GCCE_4_4', '__GCCE__', '__GCCE_4__' , '__GCCE_4_4__']
- }
-
- rootname = "toolchain_macros_armv5_%s_%s"
- rootcommand = "sbs -b smoke_suite/test_resources/toolchain_macros/bld.inf -c arm.v5.urel."
- macromatch = ": #warning( directive:)? %s(</warning>)?$"
-
- count = 0
- for toolchain in sorted(toolchains.keys()):
- t.id = "0103" + string.ascii_lowercase[count]
- t.name = rootname % (toolchain, "clean")
- t.command = rootcommand + toolchain + " clean"
- t.mustmatch_singleline = []
- t.run()
- count += 1
-
- t.id = "0103" + string.ascii_lowercase[count]
- t.name = rootname % (toolchain, "build")
- t.command = rootcommand + toolchain
- mustmatch = []
- for macro in toolchains[toolchain]:
- mustmatch.append(macromatch % macro)
- t.mustmatch_singleline = mustmatch
- t.run()
- count += 1
-
- t.id = "103"
- t.name = "toolchain_macros"
- t.print_result()
- return t
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of the License "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:
+#
+
+from raptor_tests import SmokeTest
+import string
+
+def run():
+ t = SmokeTest()
+ t.description = "Check that ARM toolchain specific macros are used in both metadata and source processing."
+ t.warnings = -1
+
+ toolchains = {
+ 'rvct2_2': ['ARMCC', 'ARMCC_2', 'ARMCC_2_2', '__ARMCC__', '__ARMCC_2__', '__ARMCC_2_2__'],
+ 'rvct3_1': ['ARMCC', 'ARMCC_3', 'ARMCC_3_1', '__ARMCC__', '__ARMCC_3__' , '__ARMCC_3_1__'],
+ 'rvct4_0': ['ARMCC', 'ARMCC_4', 'ARMCC_4_0', '__ARMCC__', '__ARMCC_4__' , '__ARMCC_4_0__'],
+ 'gcce4_3_2': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'],
+ 'gcce4_3_3': ['GCCE', 'GCCE_4', 'GCCE_4_3', '__GCCE__', '__GCCE_4__' , '__GCCE_4_3__'],
+ 'gcce4_4_1': ['GCCE', 'GCCE_4', 'GCCE_4_4', '__GCCE__', '__GCCE_4__' , '__GCCE_4_4__']
+ }
+
+ rootname = "toolchain_macros_armv5_%s_%s"
+ rootcommand = "sbs -b smoke_suite/test_resources/toolchain_macros/bld.inf -c arm.v5.urel."
+ macromatch = ": #warning( directive:)? %s(</warning>)?$"
+
+ count = 0
+ for toolchain in sorted(toolchains.keys()):
+ t.id = "0103" + string.ascii_lowercase[count]
+ t.name = rootname % (toolchain, "clean")
+ t.command = rootcommand + toolchain + " clean"
+ t.mustmatch_singleline = []
+ t.run()
+ count += 1
+
+ t.id = "0103" + string.ascii_lowercase[count]
+ t.name = rootname % (toolchain, "build")
+ t.command = rootcommand + toolchain
+ mustmatch = []
+ for macro in toolchains[toolchain]:
+ mustmatch.append(macromatch % macro)
+ t.mustmatch_singleline = mustmatch
+ t.run()
+ count += 1
+
+ t.id = "103"
+ t.name = "toolchain_macros"
+ t.print_result()
+ return t