--- a/components/stdcxx/Makefile	Thu Jun 18 04:58:04 2015 -0700
+++ b/components/stdcxx/Makefile	Thu Jun 18 10:48:41 2015 -0700
@@ -114,6 +114,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=geninlinefuncs