[Midnightbsd-cvs] src [10895] sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10895
          http://svnweb.midnightbsd.org/src/?rev=10895
Author:   laffer1
Date:     2018-06-14 09:00:10 -0400 (Thu, 14 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/gnu/lib/libsupc++/Makefile
    trunk/gnu/lib/libsupc++/Version.map

Property Changed:
----------------
    trunk/gnu/lib/libsupc++/Version.map

Modified: trunk/gnu/lib/libsupc++/Makefile
===================================================================
--- trunk/gnu/lib/libsupc++/Makefile	2018-06-14 02:27:16 UTC (rev 10894)
+++ trunk/gnu/lib/libsupc++/Makefile	2018-06-14 13:00:10 UTC (rev 10895)
@@ -1,8 +1,10 @@
 # $MidnightBSD$
-# $FreeBSD: src/gnu/lib/libsupc++/Makefile,v 1.9 2007/05/19 04:25:56 kan Exp $
+# $FreeBSD: stable/10/gnu/lib/libsupc++/Makefile 260096 2013-12-30 20:15:46Z dim $
 
+.include <bsd.own.mk>
+
 GCCVER=	4.2
-GCCDIR=	${.CURDIR}/../../../contrib/gcc4
+GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 SRCDIR=	${.CURDIR}/../../../contrib/libstdc++/libsupc++
 
@@ -21,6 +23,9 @@
 SRCS+=	cp-demangle.c
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
+.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
+CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
+.endif
 CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR} -I${GCCDIR}
 CFLAGS+=	-I${.CURDIR}/../libstdc++ -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
@@ -31,7 +36,13 @@
 INCS=	${HDRS:S;^;${SRCDIR}/;}
 INCSDIR=${INCLUDEDIR}/c++/${GCCVER}
 
+.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} != "no"
+unwind.h: ${GCCDIR}/config/arm/unwind-arm.h
+.else
 unwind.h: ${GCCDIR}/unwind-generic.h
+.endif
+
+unwind.h:
 	ln -sf ${.ALLSRC} ${.TARGET}
 
 SRCS+=		unwind.h
@@ -46,3 +57,5 @@
 
 # Filter out libc++-specific flags, and -std= flags above c++98 or gnu++98.
 CXXFLAGS:=	${CXXFLAGS:N-stdlib=libc++:N-std=c++[01][13x]:N-std=gnu++[01][13x]}
+
+CXXFLAGS.clang+= -stdlib=libstdc++

Modified: trunk/gnu/lib/libsupc++/Version.map
===================================================================
--- trunk/gnu/lib/libsupc++/Version.map	2018-06-14 02:27:16 UTC (rev 10894)
+++ trunk/gnu/lib/libsupc++/Version.map	2018-06-14 13:00:10 UTC (rev 10895)
@@ -20,6 +20,7 @@
 ## USA.
 
 ## $MidnightBSD$
+## $FreeBSD: stable/10/gnu/lib/libsupc++/Version.map 301822 2016-06-11 03:58:59Z pfg $
 
 
 # Symbols in the support library (libsupc++) have their own tag.
@@ -132,7 +133,7 @@
 
 GLIBCXX_3.4 {
     # operator new and new[]
-    _Znai[jm];
+    _Zna[jm];
     _Zna[jm]RKSt9nothrow_t;
     _Znw[jm];
     _Znw[jm]RKSt9nothrow_t;
@@ -147,6 +148,13 @@
       std::set_terminate*;
       std::set_unexpected*;
 
+      "std::unexpected()";
+      "std::get_terminate()";
+      "std::get_unexpected()";
+      "std::uncaught_exception()";
+      "std::terminate()";
+
+
       std::bad_alloc;
       std::bad_cast;
       std::exception*;
@@ -154,14 +162,20 @@
       "typeinfo for std::bad_alloc";
       "typeinfo for std::bad_cast";
       "typeinfo for std::exception";
+      "typeinfo for std::type_info";
 
       "typeinfo name for std::bad_alloc";
       "typeinfo name for std::bad_cast";
       "typeinfo name for std::exception";
+      "typeinfo name for std::type_info";
 
       "vtable for std::bad_alloc";
       "vtable for std::bad_cast";
       "vtable for std::exception";
+      "vtable for std::type_info";
+
+      std::type_info::__*;
+      "std::type_info::~type_info()";
     };
 };
 


Property changes on: trunk/gnu/lib/libsupc++/Version.map
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property