diff -r 4f9411c432fd -r 0abeb3fa670c components/stdcxx/Makefile
--- a/components/stdcxx/Makefile	Wed Jul 29 10:15:50 2015 -0700
+++ b/components/stdcxx/Makefile	Wed Jul 29 13:15:08 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # we really need to use studio so we don't like that
@@ -112,6 +112,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