--- a/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm	Wed Aug 04 12:07:55 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2stdexe.flm	Wed Oct 06 15:13:17 2010 +0100
@@ -28,13 +28,9 @@
 # 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)$(LINKER_SEPARATOR)$(call dblquote,$(STATIC_RUNTIME_DIR)/eexe.lib$(LINKER_ENTRYPOINT_ADORNMENT))
+LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_PREFIX)$(ENTRYPOINT) $(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")
-LINKER_ENTRYPOINT_SETTING:=$(LINKER_ENTRYPOINT_SETTING) $(LINKER_ENTRYPOINT_LIBDEP)
-endif
-
 ifeq ($(EPOCNESTEDEXCEPTIONS),)
   STATIC_RUNTIME_LIB:=$(USER_STATIC_RUNTIME_LIB)
 else
@@ -43,6 +39,7 @@
 
 NAMEDSYMLKUP:=1
 LIBRARY:=$(LIBRARY) euser.dso
+LIBRARY_DEBUG:=$(LIBRARY_DEBUG) euser.dso
 
 $(call vsave,CDEFS SYSTEMINCLUDE STATICLIBRARY)
 
@@ -54,7 +51,7 @@
 endif
 
 SYSTEMINCLUDE:=$(SYSTEMINCLUDE) $(EPOCROOT)/epoc32/include/stdapis
-CDEFS:=$(CDEFS) __EXE__
+CDEFS:=$(CDEFS) __EXE__ __SYMBIAN_STDCPP_SUPPORT__
 NOHIDEALL:=1
 
 include $(FLMHOME)/e32abiv2.flm