--- a/components/stdcxx/Makefile Tue Jun 16 14:11:47 2015 -0700
+++ b/components/stdcxx/Makefile Wed Jun 17 14:55:22 2015 -0700
@@ -128,6 +128,7 @@
CXXFLAGS_GENERIC += -Qoption ccfe ++boolflag:sunwcch=false
CXXFLAGS_GENERIC += -Qoption ccfe +d2,-xgeninl=system
CXXFLAGS_GENERIC += -Qoption ccfe -expand=10000
+CXXFLAGS_GENERIC += -Qoption ccfe -abiopt=mangle6
CXXFLAGS_GENERIC += -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic
CXXFLAGS_GENERIC += -instances=global
CXXFLAGS_GENERIC += $(TEMPLATE_FLAGS)