 @@ -140,21 +140,25 @@ _GLIBCXX_END_NAMESPACE_VERSION
 // gcc-4.5.0
 // <atomic> signature changes
 // The rename syntax for default exported names is
 //   asm (".symver name1,exportedname@GLIBCXX_3.4")
 //   asm (".symver name2,exportedname@@GLIBCXX_3.4.5")
 // In the future, GLIBCXX_ABI > 6 should remove all uses of
 // _GLIBCXX_*_SYMVER macros in this file.
 #if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
     && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
     && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
 #ifdef _GLIBCXX_COMPAT_
 #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
    asm (".symver " #cur "," #old "@@" #version);
 #else
 #define _GLIBCXX_ASM_SYMVER(cur, old, version)
 #endif
 _GLIBCXX_ASM_SYMVER(_ZNSt9__atomic011atomic_flag5clearESt12memory_order, _ZNVSt9__atomic011atomic_flag5clearESt12memory_order, GLIBCXX_3.4.11)
 _GLIBCXX_ASM_SYMVER(_ZNSt9__atomic011atomic_flag12test_and_setESt12memory_order, _ZNVSt9__atomic011atomic_flag12test_and_setESt12memory_order, GLIBCXX_3.4.11)
 #endif

 @@ -25,28 +25,32 @@
 #include <bits/c++config.h>
 #if defined(_GLIBCXX_SHARED)
 #define _GLIBCXX_ASYNC_ABI_COMPAT
 #endif
 #include <future>
 #include <mutex>
 #include <functional>
 #if __cplusplus < 201103L
 # error "compatibility-thread-c++0x.cc must be compiled with -std=gnu++0x"
 #endif
 #ifdef _GLIBCXX_COMPAT_
 #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
    asm (".symver " #cur "," #old "@@@" #version);
 #else
 #define _GLIBCXX_ASM_SYMVER(cur, old, version)
 #endif
 // XXX GLIBCXX_ABI Deprecated
 // gcc-4.6.0
 // <future> export changes
 #if defined(_GLIBCXX_SYMVER_GNU) && defined(_GLIBCXX_SHARED) \
     && defined(_GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE) \
     && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
 namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
+{
   const std::error_category* future_category = &std::future_category();
+}

 @@ -355,40 +355,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     bool
     basic_ofstream<wchar_t>::is_open() const;
 #endif
 _GLIBCXX_END_NAMESPACE_VERSION
 } // namespace std
 // The rename syntax for default exported names is
 //   asm (".symver name1,exportedname@GLIBCXX_3.4")
 //   asm (".symver name2,exportedname@@GLIBCXX_3.4.5")
 // In the future, GLIBCXX_ABI > 6 should remove all uses of
 // _GLIBCXX_*_SYMVER macros in this file.
 #ifdef _GLIBCXX_COMPAT_
 #define _GLIBCXX_3_4_SYMVER(XXname, name) \
    extern "C" void \
    _X##name() \
    __attribute__ ((alias(#XXname))); \
    asm (".symver " "_X" #name "," #name "@GLIBCXX_3.4");
 #define _GLIBCXX_3_4_5_SYMVER(XXname, name) \
    extern "C" void \
    _Y##name() \
    __attribute__ ((alias(#XXname))); \
    asm (".symver " "_Y" #name  "," #name "@@GLIBCXX_3.4.5");
 #define _GLIBCXX_ASM_SYMVER(cur, old, version) \
    asm (".symver " #cur "," #old "@@" #version);
 #else
 #define _GLIBCXX_3_4_SYMVER(XXname, name)
 #define _GLIBCXX_3_4_5_SYMVER(XXname, name)
 #define _GLIBCXX_ASM_SYMVER(cur, old, version)
 #endif
 #define _GLIBCXX_APPLY_SYMVER _GLIBCXX_3_4_SYMVER
 #include <abi/compatibility.h>
 #undef _GLIBCXX_APPLY_SYMVER
 #define _GLIBCXX_APPLY_SYMVER _GLIBCXX_3_4_5_SYMVER
 #include <abi/compatibility.h>
 #undef _GLIBCXX_APPLY_SYMVER
 /* gcc-3.4.0
 _ZN10__gnu_norm15_List_node_base4hookEPS0_;
 _ZN10__gnu_norm15_List_node_base4swapERS0_S1_;

 @@ -102,28 +102,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	*__s = char_type();
       if (!_M_gcount)
 	__err |= ios_base::failbit;
       if (__err)
 	this->setstate(__err);
       return *this;
+    }
   template<>
     basic_istream<char>&
     basic_istream<char>::
     ignore(streamsize __n, int_type __delim)
+    {
 #ifdef _GLIBCXX_COMPAT_
       if (traits_type::eq_int_type(__delim, traits_type::eof()))
 	return ignore(__n);
 #endif
       _M_gcount = 0;
       sentry __cerb(*this, true);
       if (__n > 0 && __cerb)
+	{
 	  ios_base::iostate __err = ios_base::goodbit;
 	  __try
+	    {
 	      const char_type __cdelim = traits_type::to_char_type(__delim);
 	      const int_type __eof = traits_type::eof();
 	      __streambuf_type* __sb = this->rdbuf();
 	      int_type __c = __sb->sgetc();
 @@ -344,28 +346,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 	*__s = char_type();
       if (!_M_gcount)
 	__err |= ios_base::failbit;
       if (__err)
 	this->setstate(__err);
       return *this;
+    }
   template<>
     basic_istream<wchar_t>&
     basic_istream<wchar_t>::
     ignore(streamsize __n, int_type __delim)
+    {
 #ifdef _GLIBCXX_COMPAT_
       if (traits_type::eq_int_type(__delim, traits_type::eof()))
 	return ignore(__n);
 #endif
       _M_gcount = 0;
       sentry __cerb(*this, true);
       if (__n > 0 && __cerb)
+	{
 	  ios_base::iostate __err = ios_base::goodbit;
 	  __try
+	    {
 	      const char_type __cdelim = traits_type::to_char_type(__delim);
 	      const int_type __eof = traits_type::eof();
 	      __streambuf_type* __sb = this->rdbuf();
 	      int_type __c = __sb->sgetc();

 @@ -1,33 +1,35 @@
-#	$NetBSD: Makefile,v 1.46 2019/03/20 05:09:27 mrg Exp $
+#	$NetBSD: Makefile,v 1.47 2019/04/23 20:55:53 christos Exp $
 REQUIRETOOLS=	yes
 NOLINT=		# defined
 UNSUPPORTED_COMPILER.clang=	# defined
 .include <bsd.init.mk>
 .include "Makefile.inc"
 LIB=		stdc++
 LIBDPLIBS+=	m ${.CURDIR}/../../../../../lib/libm
 #COPTS+=		-pthread
 #LDFLAGS+=	-pthread
 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
 COPTS.random.cc+=	${${ACTIVE_CC} == "clang":? -mrdrnd :}
 .endif
 CSHLIBFLAGS+=	-D_GLIBCXX_COMPAT_
 DIST=		${GCCDIST}
 GNUVER=		${DIST}/libstdc++-v3/config/abi/pre/gnu.ver
 SYMBOLS=	libstdc++-symbols.ver
 .if ${MKPIC} != "no"
 ${SYMBOLS}: Makefile ${GNUVER}
 	cat ${GNUVER} ${G_port_specific_symbol_files} | \
 	${TOOL_GREP} -E -v '^[     ]*#(#| |$$)' | \
 	${CXX} -I${DESTDIR}/usr/include/g++ -E -P -include ${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/symver-config.h - > \
 	${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET} && rm -f ${.TARGET}.tmp
 CLEANFILES+=	${SYMBOLS} ${SYMBOLS}.tmp
 DPADD+=		${SYMBOLS}