--- a/sbsv2/raptor/RELEASE-NOTES.txt Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Mon Mar 15 11:38:03 2010 +0000
@@ -3,11 +3,12 @@
next version
New Features:
-- Add support for FEATUREVARIANTSAFE in BV builds.
+- Add support for FEATUREVARIANTSAFE in BV builds
- Add support for Cygwin 1.7.
- New support for cross-compiling win32 tools on Linux.
To enable it, use "sbs -c tools2.win32 -c tools2" on Linux
- New prototype support for reading System Definition v3 files
+- Add support for MMP keyword EPOCNESTEDEXCEPTIONS
version 2.12.4
--- a/sbsv2/raptor/lib/config/gcce.xml Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/config/gcce.xml Mon Mar 15 11:38:03 2010 +0000
@@ -119,6 +119,7 @@
<set name="UNRESOLVED_SYMBOL_REF_OPTION" value=""/>
<set name="USER_LIBS_PATH_OPTION" value="--userlibpath"/>
<set name="USER_STATIC_RUNTIME_LIB" value="usrt3_1.lib"/>
+ <set name="USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS" value="usrt_nx_3_1.lib"/>
<set name="USERINCLUDE" value=""/>
<set name="VFE_OPTION" value=""/>
--- a/sbsv2/raptor/lib/config/variants.xml Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/config/variants.xml Mon Mar 15 11:38:03 2010 +0000
@@ -131,8 +131,8 @@
<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="USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS" value="usrt_nx_2_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"/>
@@ -158,8 +158,8 @@
<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="USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS" value="usrt_nx_3_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"/>
@@ -188,8 +188,8 @@
<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="USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS" value="usrt_nx_4_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"/>
--- a/sbsv2/raptor/lib/flm/e32abiv2ani.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2ani.flm Mon Mar 15 11:38:03 2010 +0000
@@ -36,7 +36,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
CANIGNORENONCALLABLE:=1
# Fixed export TARGETTYPEs should only reference a .def file if an explicit DEFFILE statement is present in the .mmp file
--- a/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2defaults.mk Mon Mar 15 11:38:03 2010 +0000
@@ -31,11 +31,15 @@
POSTLINKDEFFILE:=
POSTLINKFILETYPE:=
POSTLINKTARGETTYPE:=
-STATIC_RUNTIME_LIB:=
SUPPORT_FREEZE:=
NOHIDEALL:=
DEFAULT_NEWLIB:=$(DEFAULT_SYMBIAN_NEWLIB)
+ifeq ($(EPOCNESTEDEXCEPTIONS),)
+STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
+else
+STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS)
+endif
# 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)"
--- a/sbsv2/raptor/lib/flm/e32abiv2dll.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2dll.flm Mon Mar 15 11:38:03 2010 +0000
@@ -35,7 +35,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
# Default Postlinker settings
--- a/sbsv2/raptor/lib/flm/e32abiv2exe.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2exe.flm Mon Mar 15 11:38:03 2010 +0000
@@ -34,8 +34,6 @@
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
endif
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
-
$(call vsave,CDEFS)
CDEFS:=$(CDEFS) __EXE__
include $(FLMHOME)/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2exexp.flm Mon Mar 15 11:38:03 2010 +0000
@@ -30,7 +30,6 @@
$(call vsave,CDEFS)
# Determine what kind of entrypoint option to set
FIRSTLIB_OBJECTFILE=uc_exe_.o
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
ifeq ($(FIRSTLIB),)
FIRSTLIB:=eexe.lib
--- a/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2fsy.flm Mon Mar 15 11:38:03 2010 +0000
@@ -46,7 +46,6 @@
endif
UID2:=100039df
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
CANIGNORENONCALLABLE:=1
--- a/sbsv2/raptor/lib/flm/e32abiv2implib.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2implib.flm Mon Mar 15 11:38:03 2010 +0000
@@ -32,6 +32,7 @@
REQUESTEDTARGETEXT:=dll
# if there is a LINKAS variable then this won't matter
+STATIC_RUNTIME_LIB:=
# We are appending to CDEFS but we don't want this to affect
# other invocations so we are going to save it on a stack
--- a/sbsv2/raptor/lib/flm/e32abiv2lib.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2lib.flm Mon Mar 15 11:38:03 2010 +0000
@@ -25,6 +25,8 @@
POSTLINKFILETYPE:=lib
MULTIFILE_ENABLED:=
+STATIC_RUNTIME_LIB:=
+
include $(FLMHOME)/e32abiv2.flm
else
--- a/sbsv2/raptor/lib/flm/e32abiv2none.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2none.flm Mon Mar 15 11:38:03 2010 +0000
@@ -20,6 +20,7 @@
include $(FLMHOME)/e32abiv2defaults.mk
POSTLINKTARGETTYPE:=NONE
POSTLINKFILETYPE:=none
+STATIC_RUNTIME_LIB:=
# We are appending to CDEFS but we don't want this to affect
--- a/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2pdl.flm Mon Mar 15 11:38:03 2010 +0000
@@ -35,7 +35,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
CANIGNORENONCALLABLE:=1
# Fixed export TARGETTYPEs should only reference a .def file if an explicit DEFFILE statement is present in the .mmp file
--- a/sbsv2/raptor/lib/flm/e32abiv2pdll.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2pdll.flm Mon Mar 15 11:38:03 2010 +0000
@@ -35,8 +35,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
-
# Default Postlinker settings
CANHAVEEXPORTS:=1
--- a/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2plugin.flm Mon Mar 15 11:38:03 2010 +0000
@@ -28,7 +28,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
# Default Postlinker settings
CANHAVEEXPORTS:=1
--- a/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2stddll.flm Mon Mar 15 11:38:03 2010 +0000
@@ -37,7 +37,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
LIBRARY:=$(LIBRARY) euser.dso
--- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm Mon Mar 15 11:38:03 2010 +0000
@@ -35,7 +35,6 @@
LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
endif
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
NAMEDSYMLKUP:=1
LIBRARY:=$(LIBRARY) euser.dso
--- a/sbsv2/raptor/lib/flm/e32abiv2stdlib.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2stdlib.flm Mon Mar 15 11:38:03 2010 +0000
@@ -25,6 +25,8 @@
NOHIDEALL:=1
+STATIC_RUNTIME_LIB:=
+
include $(FLMHOME)/e32abiv2.flm
else
--- a/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/e32abiv2textnotifier2.flm Mon Mar 15 11:38:03 2010 +0000
@@ -35,7 +35,6 @@
endif
LINKER_STUB_LIBRARY:=$(STATIC_RUNTIME_DIR)/edllstub.lib
-STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
CANIGNORENONCALLABLE:=1
# Fixed export TARGETTYPEs should only reference a .def file if an explicit DEFFILE statement is present in the .mmp file
--- a/sbsv2/raptor/lib/flm/standard.xml Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/lib/flm/standard.xml Mon Mar 15 11:38:03 2010 +0000
@@ -60,6 +60,7 @@
<param name='EPOCSTACKSIZE' default=''/>
<param name='EPOCFIXEDPROCESS' default=''/>
<param name='EPOCALLOWDLLDATA' default=''/>
+ <param name='EPOCNESTEDEXCEPTIONS' default=''/>
<param name='PLATMACROS.WINDOWS' default=''/>
<param name='PLATMACROS.LINUX' default=''/>
<param name='STDCPP' default=''/>
@@ -172,6 +173,7 @@
<param name='SPLIT_OPTION'/>
<param name='KERNEL_STATIC_RUNTIME_LIB'/>
<param name='USER_STATIC_RUNTIME_LIB'/>
+ <param name='USER_STATIC_RUNTIME_LIB_NESTED_EXCEPTIONS'/>
<param name='STATIC_LIBS_LIST'/>
<param name='STATIC_LIBS_PATH'/>
<param name='STATIC_LIBRARY_DIR'/>
--- a/sbsv2/raptor/test/config/arm.xml Mon Mar 08 14:05:10 2010 +0000
+++ b/sbsv2/raptor/test/config/arm.xml Mon Mar 15 11:38:03 2010 +0000
@@ -9,7 +9,6 @@
<var name="ARMV5_BASE">
<env name='SBS_HOME' default='' type='path'/>
<env name='EPOCROOT'/>
- <env name='ARMROOT'/>
<set name='FLMHOME' value='$(SBS_HOME)/lib/flm'/>
<set name='TRADITIONAL_PLATFORM' value='ARMV5'/>