--- 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
--- a/components/stdcxx/isa_patches/amd64/1034-sunpro.config.amd64.patch Wed Jul 29 10:15:50 2015 -0700
+++ b/components/stdcxx/isa_patches/amd64/1034-sunpro.config.amd64.patch Wed Jul 29 13:15:08 2015 -0700
@@ -1,5 +1,5 @@
---- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 20:25:50.000000000 -0400
-+++ stdcxx-4.2.1/etc/config/sunpro.config 2009-03-30 11:28:21.364489000 -0400
+--- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 17:25:50.000000000 -0700
++++ stdcxx-4.2.1/etc/config/sunpro.config 2015-06-18 07:34:12.190922407 -0700
@@ -26,7 +26,7 @@
#
########################################################################
@@ -9,12 +9,14 @@
# extract the "C++ m.n" substring from version string (whcih changes
# from one release of the compiler to another)
-@@ -59,10 +59,10 @@
+@@ -59,10 +59,12 @@
PICFLAGS = -KPIC
LDSOFLAGS =
-CXXFLAGS = -library=%none
-+CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -verbose=template -xlang=c99 $(XREGS) $(XMEMALIGN) -xlibmieee -xbuiltin=%none -norunpath -xinline= -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m64 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef
++
++CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs,extdef -xlang=c99 $(XREGS) $(XMEMALIGN) -xlibmieee -xbuiltin=%none -norunpath -xinline= -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m64 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef
++
CXXPRELINK =
-CPPFLAGS =
-LDFLAGS = -library=%none
@@ -23,7 +25,7 @@
LDSOFLAGS = -G
# use CC to invoke the compiler (needed to pick up template
-@@ -77,7 +77,7 @@
+@@ -77,7 +79,7 @@
DEBUG_CXXFLAGS = -g
DEBUG_CPPFLAGS =
@@ -32,12 +34,3 @@
OPTMZ_CPPFLAGS =
# shared/static library options
-@@ -124,7 +124,7 @@
- ifeq ($(shell expr $(CCMAJOR) \>= 5 \& $(CCMINOR) \>= 9),1)
-
- # starting with Sun C++ 5.9, the compiler prefers the generic
-- # -m32 and -m64 options to the architecture specific -xarch
-+ # -m32 and -m64 options to the architecture specific -xarch
- # options some of which have been deprecated
- wide_flags = -m64
- narrow_flags = -m32
--- a/components/stdcxx/isa_patches/i386/1034-sunpro.config.i386.patch Wed Jul 29 10:15:50 2015 -0700
+++ b/components/stdcxx/isa_patches/i386/1034-sunpro.config.i386.patch Wed Jul 29 13:15:08 2015 -0700
@@ -1,5 +1,5 @@
---- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 20:25:50.000000000 -0400
-+++ stdcxx-4.2.1/etc/config/sunpro.config 2009-03-30 11:17:58.959880000 -0400
+--- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 17:25:50.000000000 -0700
++++ stdcxx-4.2.1/etc/config/sunpro.config 2015-06-18 07:31:34.524942817 -0700
@@ -26,7 +26,7 @@
#
########################################################################
@@ -9,12 +9,14 @@
# extract the "C++ m.n" substring from version string (whcih changes
# from one release of the compiler to another)
-@@ -59,10 +59,10 @@
+@@ -59,10 +59,12 @@
PICFLAGS = -KPIC
LDSOFLAGS =
-CXXFLAGS = -library=%none
-+CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -verbose=template -xlang=c99 $(XREGS) $(XMEMALIGN) -xlibmieee -xbuiltin=%none -norunpath -xinline= -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m32 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef
++
++CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs,extdef -xlang=c99 $(XREGS) $(XMEMALIGN) -xlibmieee -xbuiltin=%none -norunpath -xinline= -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m32 -xarch=generic -xO3 -s +w2 -errtags -erroff=hidef -Qoption ccfe -abiopt=mangle6
++
CXXPRELINK =
-CPPFLAGS =
-LDFLAGS = -library=%none
@@ -23,7 +25,7 @@
LDSOFLAGS = -G
# use CC to invoke the compiler (needed to pick up template
-@@ -77,7 +77,7 @@
+@@ -77,7 +79,7 @@
DEBUG_CXXFLAGS = -g
DEBUG_CPPFLAGS =
--- a/components/stdcxx/isa_patches/sparc/1034-sunpro.config.sparc.patch Wed Jul 29 10:15:50 2015 -0700
+++ b/components/stdcxx/isa_patches/sparc/1034-sunpro.config.sparc.patch Wed Jul 29 13:15:08 2015 -0700
@@ -1,5 +1,5 @@
---- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 20:25:50.000000000 -0400
-+++ stdcxx-4.2.1/etc/config/sunpro.config 2009-03-29 15:37:31.543081000 -0400
+--- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 17:25:50.000000000 -0700
++++ stdcxx-4.2.1/etc/config/sunpro.config 2015-06-18 07:36:06.891702109 -0700
@@ -26,7 +26,7 @@
#
########################################################################
@@ -9,12 +9,15 @@
# extract the "C++ m.n" substring from version string (whcih changes
# from one release of the compiler to another)
-@@ -59,10 +59,10 @@
+@@ -59,10 +59,13 @@
PICFLAGS = -KPIC
LDSOFLAGS =
-CXXFLAGS = -library=%none
-+CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -verbose=template -xlang=c99 $(XREGS) -xvis=yes $(XMEMALIGN) -xlibmieee -xbuiltin=%none -xinline= -norunpath -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -Qoption iropt -xwrap_int -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m32 -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 -xO4 -s +w2 -errtags -erroff=hidef
++
++
++CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs,extdef -xlang=c99 $(XREGS) -xvis=yes $(XMEMALIGN) -xlibmieee -xbuiltin=%none -xinline= -norunpath -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -Qoption iropt -xwrap_int -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m32 -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 -xO4 -s +w2 -errtags -erroff=hidef -Qoption ccfe -abiopt=mangle6
++
CXXPRELINK =
-CPPFLAGS =
-LDFLAGS = -library=%none
@@ -23,7 +26,7 @@
LDSOFLAGS = -G
# use CC to invoke the compiler (needed to pick up template
-@@ -77,7 +77,7 @@
+@@ -77,7 +80,7 @@
DEBUG_CXXFLAGS = -g
DEBUG_CPPFLAGS =
@@ -32,12 +35,3 @@
OPTMZ_CPPFLAGS =
# shared/static library options
-@@ -124,7 +124,7 @@
- ifeq ($(shell expr $(CCMAJOR) \>= 5 \& $(CCMINOR) \>= 9),1)
-
- # starting with Sun C++ 5.9, the compiler prefers the generic
-- # -m32 and -m64 options to the architecture specific -xarch
-+ # -m32 and -m64 options to the architecture specific -xarch
- # options some of which have been deprecated
- wide_flags = -m64
- narrow_flags = -m32
--- a/components/stdcxx/isa_patches/sparcv9/1034-sunpro.config.sparcv9.patch Wed Jul 29 10:15:50 2015 -0700
+++ b/components/stdcxx/isa_patches/sparcv9/1034-sunpro.config.sparcv9.patch Wed Jul 29 13:15:08 2015 -0700
@@ -1,5 +1,5 @@
---- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 20:25:50.000000000 -0400
-+++ stdcxx-4.2.1/etc/config/sunpro.config 2009-03-29 18:32:16.095641000 -0400
+--- stdcxx-4.2.1/etc/config/sunpro.config 2008-04-24 17:25:50.000000000 -0700
++++ stdcxx-4.2.1/etc/config/sunpro.config 2015-06-18 07:38:41.834575412 -0700
@@ -26,7 +26,7 @@
#
########################################################################
@@ -9,12 +9,14 @@
# extract the "C++ m.n" substring from version string (whcih changes
# from one release of the compiler to another)
-@@ -59,10 +59,10 @@
+@@ -59,10 +59,12 @@
PICFLAGS = -KPIC
LDSOFLAGS =
-CXXFLAGS = -library=%none
-+CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs -verbose=template -xlang=c99 $(XREGS) -xvis=yes $(XMEMALIGN) -xlibmieee -xbuiltin=%none -xinline= -norunpath -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -Qoption iropt -xwrap_int -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m64 -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 -xO4 -s +w2 -errtags -erroff=hidef
++
++CXXFLAGS = -library=no%Cstd -library=Crun -features=except,rtti,export,extensions,nestedaccess,tmplife,tmplrefstatic -instances=global -template=geninlinefuncs,extdef -xlang=c99 $(XREGS) -xvis=yes $(XMEMALIGN) -xlibmieee -xbuiltin=%none -xinline= -norunpath -Qoption ccfe +d2,-xgeninl=system -Qoption ccfe -expand=10000 -Qoption ccfe ++boolflag:sunwcch=false -Qoption iropt -xwrap_int -mt -D_REENTRANT -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_POSIX_PTHREAD_SEMANTICS -D__EXTENSIONS__ -D_XOPEN_SOURCE=500 -D_XPG5 -D_RWSTD_NO_REPLACEABLE_NEW_DELETE -D_RWSTD_NO_EXT_OPERATOR_NEW -D_IN_BUILD_STDCXX -m64 -xtarget=ultra2 -xarch=sparcvis -xchip=ultra2 -xO4 -s +w2 -errtags -erroff=hidef -Qoption ccfe -abiopt=mangle6
++
CXXPRELINK =
-CPPFLAGS =
-LDFLAGS = -library=%none
@@ -23,7 +25,7 @@
LDSOFLAGS = -G
# use CC to invoke the compiler (needed to pick up template
-@@ -77,7 +77,7 @@
+@@ -77,7 +79,7 @@
DEBUG_CXXFLAGS = -g
DEBUG_CPPFLAGS =
@@ -32,12 +34,3 @@
OPTMZ_CPPFLAGS =
# shared/static library options
-@@ -124,7 +124,7 @@
- ifeq ($(shell expr $(CCMAJOR) \>= 5 \& $(CCMINOR) \>= 9),1)
-
- # starting with Sun C++ 5.9, the compiler prefers the generic
-- # -m32 and -m64 options to the architecture specific -xarch
-+ # -m32 and -m64 options to the architecture specific -xarch
- # options some of which have been deprecated
- wide_flags = -m64
- narrow_flags = -m32
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/stdcxx/patches/094-19297051.6to5.patch Wed Jul 29 13:15:08 2015 -0700
@@ -0,0 +1,307 @@
+# Internal patch for Studio C++ 12.4.
+# The upstream project at the ASF is defunct.
+--- stdcxx-4.2.1/src/ti_istream.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_istream.cpp Mon Jun 1 22:40:44 2015
+@@ -38,3 +38,9 @@
+ #undef _RWSTD_NO_TEMPLATE_DEFINITIONS
+
+ #include <istream>
++#ifndef __LP64__
++#pragma weak "__1cDstdLchar_traits4Cc_Efind6FpkcIr2_p2_" = "__1cDstdLchar_traits4Cc_Efind6FpkcIr2_3_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdLchar_traits4Cc_Efind6FpkcLr2_p2_" = "__1cDstdLchar_traits4Cc_Efind6FpkcLr2_3_"
++#endif
+--- stdcxx-4.2.1/src/ti_wtime_put.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_wtime_put.cpp Mon Jun 1 22:40:44 2015
+@@ -51,3 +51,9 @@
+ _RWSTD_SPECIALIZE_USE_FACET (wtime_put);
+
+ #endif // _RWSTD_NO_WCHAR_T
++#ifndef __LP64__
++#pragma weak "__1cDstdItime_put4Cwn0ATostreambuf_iterator4Cwn0ALchar_traits4Cw_____Dput6kMn0C_rn0AIios_base_wpkn0ACtm_pkwp8_2_" = "__1cDstdItime_put4Cwn0ATostreambuf_iterator4Cwn0ALchar_traits4Cw_____Dput6kMn0C_rn0AIios_base_wpkn0ACtm_pkw9A_2_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdItime_put4Cwn0ATostreambuf_iterator4Cwn0ALchar_traits4Cw_____Dput6kMn0C_rn0AIios_base_wpkn0ACtm_pkwp8_2_" = "__1cDstdItime_put4Cwn0ATostreambuf_iterator4Cwn0ALchar_traits4Cw_____Dput6kMn0C_rn0AIios_base_wpkn0ACtm_pkw9A_2_"
++#endif
+--- stdcxx-4.2.1/src/ti_string.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_string.cpp Mon Jun 1 22:40:44 2015
+@@ -49,3 +49,11 @@
+ ^ _RWSTD_DEFINE_TEMPLATE_LAST (_BASIC_STRING))
+ # error _RWSTD_DEFINE_TEMPLATE definitions inconsistent
+ #endif
++#ifndef __LP64__
++#pragma weak "__1cDstdIdistance4Cpkc_6FTA3_TB_" = "__1cDstdIdistance4Cpkc_6FTA3_n0APiterator_traits3C3_Pdifference_type__"
++#pragma weak "__1cDstdIdistance4Cpc_6FTA2_TB_" = "__1cDstdIdistance4Cpc_6FTA2_n0APiterator_traits3C2_Pdifference_type__"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdIdistance4Cpkc_6FTA3_TB_" = "__1cDstdIdistance4Cpkc_6FTA3_n0APiterator_traits3C3_Pdifference_type__"
++#pragma weak "__1cDstdIdistance4Cpc_6FTA2_TB_" = "__1cDstdIdistance4Cpc_6FTA2_n0APiterator_traits3C2_Pdifference_type__"
++#endif
+--- stdcxx-4.2.1/src/ti_money_put.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_money_put.cpp Mon Jun 1 22:40:44 2015
+@@ -48,3 +48,9 @@
+ _RWSTD_SPECIALIZE_FACET_ID (money_put, TARGS_C);
+ _RWSTD_DEFINE_FACET_FACTORY (static, money_put, TARGS_C, money_put);
+ _RWSTD_SPECIALIZE_USE_FACET (money_put);
++#ifndef __LP64__
++#pragma weak "__1cDstdJmoney_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____G_C_put6kMn0C_irn0AIios_base_cpkcIip5I_2_" = "__1cDstdJmoney_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____G_C_put6kMn0C_irn0AIios_base_cpkcIi6I_2_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdJmoney_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____G_C_put6kMn0C_irn0AIios_base_cpkcLip5L_2_" = "__1cDstdJmoney_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____G_C_put6kMn0C_irn0AIios_base_cpkcLi6L_2_"
++#endif
+--- stdcxx-4.2.1/src/wctype.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/wctype.cpp Mon Jun 1 22:40:44 2015
+@@ -1109,3 +1109,31 @@
+ _RWSTD_SPECIALIZE_USE_FACET (wctype);
+
+ #endif // _RWSTD_NO_WCHAR_T
++#ifndef __LP64__
++#pragma weak "__1cDstdFctype4Cw_Fdo_is6kMpkwp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdFctype4Cw_Fdo_is6kMpkw3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_toupper6kMpwpkw_p3_" = "__1cDstdFctype4Cw_Kdo_toupper6kMpwpkw_4_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_tolower6kMpwpkw_p3_" = "__1cDstdFctype4Cw_Kdo_tolower6kMpwpkw_4_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdFctype4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdFctype4Cw_Jdo_narrow6kMpkwp2cpc_4_" = "__1cDstdFctype4Cw_Jdo_narrow6kMpkw3cpc_3_"
++#pragma weak "__1cDstdMctype_byname4Cw_Fdo_is6kMpkwp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdMctype_byname4Cw_Fdo_is6kMpkw3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_toupper6kMpwpkw_p3_" = "__1cDstdMctype_byname4Cw_Kdo_toupper6kMpwpkw_4_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_tolower6kMpwpkw_p3_" = "__1cDstdMctype_byname4Cw_Kdo_tolower6kMpwpkw_4_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdMctype_byname4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdMctype_byname4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdMctype_byname4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdMctype_byname4Cw_Jdo_narrow6kMpkwp2cpc_4_" = "__1cDstdMctype_byname4Cw_Jdo_narrow6kMpkw3cpc_3_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdFctype4Cw_Fdo_is6kMpkwp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdFctype4Cw_Fdo_is6kMpkw3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_toupper6kMpwpkw_p3_" = "__1cDstdFctype4Cw_Kdo_toupper6kMpwpkw_4_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_tolower6kMpwpkw_p3_" = "__1cDstdFctype4Cw_Kdo_tolower6kMpwpkw_4_"
++#pragma weak "__1cDstdFctype4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdFctype4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdFctype4Cw_Jdo_narrow6kMpkwp2cpc_4_" = "__1cDstdFctype4Cw_Jdo_narrow6kMpkw3cpc_3_"
++#pragma weak "__1cDstdMctype_byname4Cw_Fdo_is6kMpkwp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdMctype_byname4Cw_Fdo_is6kMpkw3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_toupper6kMpwpkw_p3_" = "__1cDstdMctype_byname4Cw_Kdo_toupper6kMpwpkw_4_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_tolower6kMpwpkw_p3_" = "__1cDstdMctype_byname4Cw_Kdo_tolower6kMpwpkw_4_"
++#pragma weak "__1cDstdMctype_byname4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdMctype_byname4Cw_Kdo_scan_is6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdMctype_byname4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdMctype_byname4Cw_Ldo_scan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#pragma weak "__1cDstdMctype_byname4Cw_Jdo_narrow6kMpkwp2cpc_4_" = "__1cDstdMctype_byname4Cw_Jdo_narrow6kMpkw3cpc_3_"
++#endif
+--- stdcxx-4.2.1/src/codecvt.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/codecvt.cpp Mon Jun 1 22:40:44 2015
+@@ -280,3 +280,13 @@
+ _RWSTD_SPECIALIZE_USE_FACET (codecvt);
+
+
++#ifndef __LP64__
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Gdo_out6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Gdo_out6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4I_i_" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5I_i_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Gdo_out6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Gdo_out6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4L_i_" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5L_i_"
++#endif
+--- stdcxx-4.2.1/src/bitset.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/bitset.cpp Mon Jun 1 22:40:44 2015
+@@ -311,3 +311,11 @@
+
+
+ } // namespace __rw
++#ifndef __LP64__
++#pragma weak "__1cDstdLchar_traits4Cw_Leq_int_type6Frklr2_b_" = "__1cDstdLchar_traits4Cw_Leq_int_type6Frkl3_b_"
++#pragma weak "__1cDstdLchar_traits4Cc_Leq_int_type6Frkir2_b_" = "__1cDstdLchar_traits4Cc_Leq_int_type6Frki3_b_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdLchar_traits4Cw_Leq_int_type6Frkir2_b_" = "__1cDstdLchar_traits4Cw_Leq_int_type6Frki3_b_"
++#pragma weak "__1cDstdLchar_traits4Cc_Leq_int_type6Frkir2_b_" = "__1cDstdLchar_traits4Cc_Leq_int_type6Frki3_b_"
++#endif
+--- stdcxx-4.2.1/src/ti_time_get.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_time_get.cpp Mon Jun 1 22:40:44 2015
+@@ -47,3 +47,9 @@
+ _RWSTD_SPECIALIZE_FACET_ID (time_get, TARGS_C);
+ _RWSTD_DEFINE_FACET_FACTORY (static, time_get, TARGS_C, time_get);
+ _RWSTD_SPECIALIZE_USE_FACET (time_get);
++#ifndef __LP64__
++#pragma weak "__1cDstdItime_get4Ccn0ATistreambuf_iterator4Ccn0ALchar_traits4Cc_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkcp9B_2_" = "__1cDstdItime_get4Ccn0ATistreambuf_iterator4Ccn0ALchar_traits4Cc_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkc9C_2_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdItime_get4Ccn0ATistreambuf_iterator4Ccn0ALchar_traits4Cc_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkcp9B_2_" = "__1cDstdItime_get4Ccn0ATistreambuf_iterator4Ccn0ALchar_traits4Cc_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkc9C_2_"
++#endif
+--- stdcxx-4.2.1/src/wcodecvt.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/wcodecvt.cpp Mon Jun 1 22:40:44 2015
+@@ -1765,3 +1765,19 @@
+ _RWSTD_SPECIALIZE_USE_FACET (wcodecvt);
+
+ #endif // _RWSTD_NO_WCHAR_T
++#ifndef __LP64__
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4I_i_" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5I_i_"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4I_i_" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5I_i_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4L_i_" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5L_i_"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Fdo_in6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Gdo_out6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkcp4L_i_" = "__1cDstdOcodecvt_byname4CwCcnL__mbstate_t__Jdo_length6kMrn0B_pkc5L_i_"
++#endif
+--- stdcxx-4.2.1/src/collate.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/collate.cpp Mon Jun 1 22:40:44 2015
+@@ -1236,3 +1236,29 @@
+
+
+ } // namespace std
++#ifndef __LP64__
++#pragma weak "__1cDstdHcollate4Cc_Kdo_compare6kMpkcp244_i_" = "__1cDstdHcollate4Cc_Kdo_compare6kMpkc333_i_"
++#pragma weak "__1cDstdHcollate4Cc_Mdo_transform6kMpkcp2_n0AMbasic_string4Ccn0ALchar_traits4Cc__n0AJallocator4Cc_____" = "__1cDstdHcollate4Cc_Mdo_transform6kMpkc3_n0AMbasic_string4Ccn0ALchar_traits4Cc__n0AJallocator4Cc_____"
++#pragma weak "__1cDstdHcollate4Cc_Hdo_hash6kMpkcp2_l_" = "__1cDstdHcollate4Cc_Hdo_hash6kMpkc3_l_"
++#pragma weak "__1cDstdHcollate4Cw_Kdo_compare6kMpkwp244_i_" = "__1cDstdHcollate4Cw_Kdo_compare6kMpkw333_i_"
++#pragma weak "__1cDstdHcollate4Cw_Mdo_transform6kMpkwp2_n0AMbasic_string4Cwn0ALchar_traits4Cw__n0AJallocator4Cw_____" = "__1cDstdHcollate4Cw_Mdo_transform6kMpkw3_n0AMbasic_string4Cwn0ALchar_traits4Cw__n0AJallocator4Cw_____"
++#pragma weak "__1cDstdHcollate4Cw_Hdo_hash6kMpkwp2_l_" = "__1cDstdHcollate4Cw_Hdo_hash6kMpkw3_l_"
++#pragma weak "__1cDstdLchar_traits4Cw_Hcompare6Fpkwp2I_i_" = "__1cDstdLchar_traits4Cw_Hcompare6Fpkw3I_i_"
++#pragma weak "__1cDstdLchar_traits4Cc_Hcompare6Fpkcp2I_i_" = "__1cDstdLchar_traits4Cc_Hcompare6Fpkc3I_i_"
++#pragma weak "__1cDstdLchar_traits4Cw_Efind6FpkwIr2_p2_" = "__1cDstdLchar_traits4Cw_Efind6FpkwIr2_3_"
++#pragma weak "__1cE__rwR__rw_new_capacity4CwnDstdLchar_traits4Cw__n0BJallocator4Cw___6FTApkn0BMbasic_string3C2CTBCTC___2_" = "__1cE__rwR__rw_new_capacity4CwnDstdLchar_traits4Cw__n0BJallocator4Cw___6Fn0BMbasic_string3CTACTBCTC_Jsize_type_pk5_6_"
++#pragma weak "__1cE__rwR__rw_new_capacity4CcnDstdLchar_traits4Cc__n0BJallocator4Cc___6FTApkn0BMbasic_string3C2CTBCTC___2_" = "__1cE__rwR__rw_new_capacity4CcnDstdLchar_traits4Cc__n0BJallocator4Cc___6Fn0BMbasic_string3CTACTBCTC_Jsize_type_pk5_6_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdHcollate4Cc_Kdo_compare6kMpkcp244_i_" = "__1cDstdHcollate4Cc_Kdo_compare6kMpkc333_i_"
++#pragma weak "__1cDstdHcollate4Cc_Mdo_transform6kMpkcp2_n0AMbasic_string4Ccn0ALchar_traits4Cc__n0AJallocator4Cc_____" = "__1cDstdHcollate4Cc_Mdo_transform6kMpkc3_n0AMbasic_string4Ccn0ALchar_traits4Cc__n0AJallocator4Cc_____"
++#pragma weak "__1cDstdHcollate4Cc_Hdo_hash6kMpkcp2_l_" = "__1cDstdHcollate4Cc_Hdo_hash6kMpkc3_l_"
++#pragma weak "__1cDstdHcollate4Cw_Kdo_compare6kMpkwp244_i_" = "__1cDstdHcollate4Cw_Kdo_compare6kMpkw333_i_"
++#pragma weak "__1cDstdHcollate4Cw_Mdo_transform6kMpkwp2_n0AMbasic_string4Cwn0ALchar_traits4Cw__n0AJallocator4Cw_____" = "__1cDstdHcollate4Cw_Mdo_transform6kMpkw3_n0AMbasic_string4Cwn0ALchar_traits4Cw__n0AJallocator4Cw_____"
++#pragma weak "__1cDstdHcollate4Cw_Hdo_hash6kMpkwp2_l_" = "__1cDstdHcollate4Cw_Hdo_hash6kMpkw3_l_"
++#pragma weak "__1cDstdLchar_traits4Cw_Hcompare6Fpkwp2L_i_" = "__1cDstdLchar_traits4Cw_Hcompare6Fpkw3L_i_"
++#pragma weak "__1cDstdLchar_traits4Cc_Hcompare6Fpkcp2L_i_" = "__1cDstdLchar_traits4Cc_Hcompare6Fpkc3L_i_"
++#pragma weak "__1cDstdLchar_traits4Cw_Efind6FpkwLr2_p2_" = "__1cDstdLchar_traits4Cw_Efind6FpkwLr2_3_"
++#pragma weak "__1cE__rwR__rw_new_capacity4CwnDstdLchar_traits4Cw__n0BJallocator4Cw___6FTApkn0BMbasic_string3C2CTBCTC___2_" = "__1cE__rwR__rw_new_capacity4CwnDstdLchar_traits4Cw__n0BJallocator4Cw___6Fn0BMbasic_string3CTACTBCTC_Jsize_type_pk5_6_"
++#pragma weak "__1cE__rwR__rw_new_capacity4CcnDstdLchar_traits4Cc__n0BJallocator4Cc___6FTApkn0BMbasic_string3C2CTBCTC___2_" = "__1cE__rwR__rw_new_capacity4CcnDstdLchar_traits4Cc__n0BJallocator4Cc___6Fn0BMbasic_string3CTACTBCTC_Jsize_type_pk5_6_"
++#endif
+--- stdcxx-4.2.1/src/ctype.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ctype.cpp Mon Jun 1 22:40:44 2015
+@@ -968,3 +968,21 @@
+
+
+ } // namespace std
++#ifndef __LP64__
++#pragma weak "__1cDstdFctype4Cc_Cis6kMpkcp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdFctype4Cc_Cis6kMpkc3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdFctype4Cc_Hscan_is6kMnE__rwP__rw_ctype_mask_pkcp4_6_" = "__1cDstdFctype4Cc_Hscan_is6kMnE__rwP__rw_ctype_mask_pkc5_5_"
++#pragma weak "__1cDstdFctype4Cc_Iscan_not6kMnE__rwP__rw_ctype_mask_pkcp4_6_" = "__1cDstdFctype4Cc_Iscan_not6kMnE__rwP__rw_ctype_mask_pkc5_5_"
++#pragma weak "__1cDstdFctype4Cc_Kdo_toupper6kMpcpkc_p3_" = "__1cDstdFctype4Cc_Kdo_toupper6kMpcpkc_4_"
++#pragma weak "__1cDstdFctype4Cc_Kdo_tolower6kMpcpkc_p3_" = "__1cDstdFctype4Cc_Kdo_tolower6kMpcpkc_4_"
++#pragma weak "__1cDstdFctype4Cc_Ido_widen6kMpkcp2pc_4_" = "__1cDstdFctype4Cc_Ido_widen6kMpkc3pc_3_"
++#pragma weak "__1cDstdFctype4Cc_Jdo_narrow6kMpkcp2cpc_4_" = "__1cDstdFctype4Cc_Jdo_narrow6kMpkc3cpc_3_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdFctype4Cc_Cis6kMpkcp2pnE__rwP__rw_ctype_mask__4_" = "__1cDstdFctype4Cc_Cis6kMpkc3pnE__rwP__rw_ctype_mask__3_"
++#pragma weak "__1cDstdFctype4Cc_Hscan_is6kMnE__rwP__rw_ctype_mask_pkcp4_6_" = "__1cDstdFctype4Cc_Hscan_is6kMnE__rwP__rw_ctype_mask_pkc5_5_"
++#pragma weak "__1cDstdFctype4Cc_Iscan_not6kMnE__rwP__rw_ctype_mask_pkcp4_6_" = "__1cDstdFctype4Cc_Iscan_not6kMnE__rwP__rw_ctype_mask_pkc5_5_"
++#pragma weak "__1cDstdFctype4Cc_Kdo_toupper6kMpcpkc_p3_" = "__1cDstdFctype4Cc_Kdo_toupper6kMpcpkc_4_"
++#pragma weak "__1cDstdFctype4Cc_Kdo_tolower6kMpcpkc_p3_" = "__1cDstdFctype4Cc_Kdo_tolower6kMpcpkc_4_"
++#pragma weak "__1cDstdFctype4Cc_Ido_widen6kMpkcp2pc_4_" = "__1cDstdFctype4Cc_Ido_widen6kMpkc3pc_3_"
++#pragma weak "__1cDstdFctype4Cc_Jdo_narrow6kMpkcp2cpc_4_" = "__1cDstdFctype4Cc_Jdo_narrow6kMpkc3cpc_3_"
++#endif
+--- stdcxx-4.2.1/src/ti_podarray.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_podarray.cpp Mon Jun 1 22:40:44 2015
+@@ -39,3 +39,9 @@
+ #undef _RWSTD_NO_TEMPLATE_DEFINITIONS
+
+ #include "podarray.h"
++#ifndef __LP64__
++#pragma weak "__1cDstdLchar_traits4CpkI_Ceq6Frk2r4_b_" = "__1cDstdLchar_traits4CpkI_Ceq6Frk25_b_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdLchar_traits4CpkI_Ceq6Frk2r4_b_" = "__1cDstdLchar_traits4CpkI_Ceq6Frk25_b_"
++#endif
+--- stdcxx-4.2.1/src/exception.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/exception.cpp Mon Jun 1 22:40:44 2015
+@@ -955,3 +955,9 @@
+
+
+ } // namespace __rw
++#ifndef __LP64__
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Cin6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Cin6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Cin6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Cin6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#endif
+--- stdcxx-4.2.1/src/ti_time_put.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_time_put.cpp Mon Jun 1 22:40:44 2015
+@@ -47,3 +47,9 @@
+ _RWSTD_SPECIALIZE_FACET_ID (time_put, TARGS_C);
+ _RWSTD_DEFINE_FACET_FACTORY (static, time_put, TARGS_C, time_put);
+ _RWSTD_SPECIALIZE_USE_FACET (time_put);
++#ifndef __LP64__
++#pragma weak "__1cDstdItime_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____Dput6kMn0C_rn0AIios_base_cpkn0ACtm_pkcp8_2_" = "__1cDstdItime_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____Dput6kMn0C_rn0AIios_base_cpkn0ACtm_pkc9A_2_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdItime_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____Dput6kMn0C_rn0AIios_base_cpkn0ACtm_pkcp8_2_" = "__1cDstdItime_put4Ccn0ATostreambuf_iterator4Ccn0ALchar_traits4Cc_____Dput6kMn0C_rn0AIios_base_cpkn0ACtm_pkc9A_2_"
++#endif
+--- stdcxx-4.2.1/src/iostream.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/iostream.cpp Mon Jun 1 22:40:44 2015
+@@ -399,3 +399,23 @@
+
+
+ } // namespace std
++#ifndef __LP64__
++#pragma weak "__1cDstdFctype4Cc_Fwiden6kMpkc3pc_p2_" = "__1cDstdFctype4Cc_Fwiden6kMpkc3pc_3_"
++#pragma weak "__1cDstdNbasic_filebuf4Ccn0ALchar_traits4Cc___U_C_crlf_intern_count6kMpkcp2_i_" = "__1cDstdNbasic_filebuf4Ccn0ALchar_traits4Cc___U_C_crlf_intern_count6kMpkc3_i_"
++#pragma weak "__1cDstdLchar_traits4Cc_Ceq6Frkcr2_b_" = "__1cDstdLchar_traits4Cc_Ceq6Frkc3_b_"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Dout6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Dout6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Cin6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Cin6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdNbasic_filebuf4Cwn0ALchar_traits4Cw___U_C_crlf_intern_count6kMpkwp2_i_" = "__1cDstdNbasic_filebuf4Cwn0ALchar_traits4Cw___U_C_crlf_intern_count6kMpkw3_i_"
++#pragma weak "__1cDstdLchar_traits4Cw_Ceq6Frkwr2_b_" = "__1cDstdLchar_traits4Cw_Ceq6Frkw3_b_"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Dout6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Dout6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdFctype4Cc_Fwiden6kMpkc3pc_p2_" = "__1cDstdFctype4Cc_Fwiden6kMpkc3pc_3_"
++#pragma weak "__1cDstdNbasic_filebuf4Ccn0ALchar_traits4Cc___U_C_crlf_intern_count6kMpkcp2_l_" = "__1cDstdNbasic_filebuf4Ccn0ALchar_traits4Cc___U_C_crlf_intern_count6kMpkc3_l_"
++#pragma weak "__1cDstdLchar_traits4Cc_Ceq6Frkcr2_b_" = "__1cDstdLchar_traits4Cc_Ceq6Frkc3_b_"
++#pragma weak "__1cDstdHcodecvt4CcCcnL__mbstate_t__Dout6kMrn0B_pkcp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CcCcnL__mbstate_t__Dout6kMrn0B_pkc5r5pc7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Cin6kMrn0B_pkcp4r6pw8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Cin6kMrn0B_pkc5r5pw7r7_n0AMcodecvt_baseGresult__"
++#pragma weak "__1cDstdNbasic_filebuf4Cwn0ALchar_traits4Cw___U_C_crlf_intern_count6kMpkwp2_l_" = "__1cDstdNbasic_filebuf4Cwn0ALchar_traits4Cw___U_C_crlf_intern_count6kMpkw3_l_"
++#pragma weak "__1cDstdLchar_traits4Cw_Ceq6Frkwr2_b_" = "__1cDstdLchar_traits4Cw_Ceq6Frkw3_b_"
++#pragma weak "__1cDstdHcodecvt4CwCcnL__mbstate_t__Dout6kMrn0B_pkwp4r6pc8r8_n0AMcodecvt_baseGresult__" = "__1cDstdHcodecvt4CwCcnL__mbstate_t__Dout6kMrn0B_pkw5r5pc7r7_n0AMcodecvt_baseGresult__"
++#endif
+--- stdcxx-4.2.1/src/ti_wtime_get.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_wtime_get.cpp Mon Jun 1 22:40:44 2015
+@@ -51,3 +51,9 @@
+ _RWSTD_SPECIALIZE_USE_FACET (wtime_get);
+
+ #endif // _RWSTD_NO_WCHAR_T
++#ifndef __LP64__
++#pragma weak "__1cDstdItime_get4Cwn0ATistreambuf_iterator4Cwn0ALchar_traits4Cw_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkwp9B_2_" = "__1cDstdItime_get4Cwn0ATistreambuf_iterator4Cwn0ALchar_traits4Cw_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkw9C_2_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdItime_get4Cwn0ATistreambuf_iterator4Cwn0ALchar_traits4Cw_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkwp9B_2_" = "__1cDstdItime_get4Cwn0ATistreambuf_iterator4Cwn0ALchar_traits4Cw_____Dget6kMn0C_2rn0AIios_base_rnE__rwM__rw_iostate_pn0ACtm_pkw9C_2_"
++#endif
+--- stdcxx-4.2.1/src/ti_wstring.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_wstring.cpp Mon Jun 1 22:40:44 2015
+@@ -38,3 +38,11 @@
+ #undef _RWSTD_NO_TEMPLATE_DEFINITIONS
+
+ #include <string>
++#ifndef __LP64__
++#pragma weak "__1cDstdIdistance4Cpkw_6FTA3_TB_" = "__1cDstdIdistance4Cpkw_6FTA3_n0APiterator_traits3C3_Pdifference_type__"
++#pragma weak "__1cDstdIdistance4Cpw_6FTA2_TB_" = "__1cDstdIdistance4Cpw_6FTA2_n0APiterator_traits3C2_Pdifference_type__"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdIdistance4Cpkw_6FTA3_TB_" = "__1cDstdIdistance4Cpkw_6FTA3_n0APiterator_traits3C3_Pdifference_type__"
++#pragma weak "__1cDstdIdistance4Cpw_6FTA2_TB_" = "__1cDstdIdistance4Cpw_6FTA2_n0APiterator_traits3C2_Pdifference_type__"
++#endif
+--- stdcxx-4.2.1/src/ti_wistream.cpp Mon Jun 1 22:40:44 2015
++++ stdcxx-4.2.1/src/ti_wistream.cpp Mon Jun 1 22:40:44 2015
+@@ -38,3 +38,9 @@
+ #undef _RWSTD_NO_TEMPLATE_DEFINITIONS
+
+ #include <istream>
++#ifndef __LP64__
++#pragma weak "__1cDstdFctype4Cw_Iscan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Iscan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#endif
++#if defined(__LP64__) && defined(__sparc)
++#pragma weak "__1cDstdFctype4Cw_Iscan_not6kMnE__rwP__rw_ctype_mask_pkwp4_6_" = "__1cDstdFctype4Cw_Iscan_not6kMnE__rwP__rw_ctype_mask_pkw5_5_"
++#endif
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/stdcxx/patches/095-19565781.patch Wed Jul 29 13:15:08 2015 -0700
@@ -0,0 +1,24 @@
+# Internal patch for Studio C++ 12.4.
+# The upstream project at the ASF is defunct.
+--- stdcxx-4.2.1/include/rw/_config-sunpro.h Mon Apr 6 12:06:23 2015
++++ stdcxx-4.2.1/include/rw/_config-sunpro.h Tue Apr 7 14:35:34 2015
+@@ -63,3 +63,8 @@
+ # define _RWSTD_STRICT_SPARCV8_MUTEX_ALIGNMENT 1
+ #endif
+
++#if defined(_TEMPLATE_NO_EXTDEF)
++#undef _RWSTD_NO_IMPLICIT_INCLUSION
++#define _RWSTD_NO_IMPLICIT_INCLUSION
++#endif
++
+--- stdcxx-4.2.1/include/loc/_numpunct.h Mon Mar 30 23:03:58 2015
++++ stdcxx-4.2.1/include/loc/_numpunct.h Wed Apr 1 23:04:38 2015
+@@ -84,7 +84,7 @@
+
+ protected:
+
+- virtual ~numpunct () { }
++ virtual ~numpunct () ;
+
+ // 22.2.3.1.2, p1
+ virtual char_type do_decimal_point () const {