[Midnightbsd-cvs] src [9683] trunk/gnu/lib/libstdc++: tweak configuration for newer LLVM versions

[laffer1 at midnightbsd.org]

Revision: 9683
          http://svnweb.midnightbsd.org/src/?rev=9683
Author:   laffer1
Date:     2017-12-16 00:24:14 -0500 (Sat, 16 Dec 2017)
Log Message:
-----------
tweak configuration for newer LLVM versions

Modified Paths:
--------------
    trunk/gnu/lib/libstdc++/Makefile
    trunk/gnu/lib/libstdc++/config.h

Modified: trunk/gnu/lib/libstdc++/Makefile
===================================================================
--- trunk/gnu/lib/libstdc++/Makefile	2017-12-13 21:40:26 UTC (rev 9682)
+++ trunk/gnu/lib/libstdc++/Makefile	2017-12-16 05:24:14 UTC (rev 9683)
@@ -1,6 +1,8 @@
 # $MidnightBSD$
-# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.61 2007/08/16 23:02:00 kan Exp $
+# $FreeBSD: stable/10/gnu/lib/libstdc++/Makefile 260096 2013-12-30 20:15:46Z dim $
 
+.include <bsd.own.mk>
+
 GCCVER=	4.2
 GCCDIR=	${.CURDIR}/../../../contrib/gcc4
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -15,6 +17,9 @@
 SHLIB_MAJOR=	6
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
+.if ${MACHINE_CPUARCH} == "arm" && ${MK_ARM_EABI} == "no"
+CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
+.endif
 CFLAGS+=	-I${.CURDIR} -I${SUPDIR} -I${GCCDIR} -I${SRCDIR}/include
 CFLAGS+=	-I${GCCLIB}/include -I${SRCDIR}/include -I.
 CFLAGS+=	-frandom-seed=RepeatabilityConsideredGood
@@ -592,7 +597,13 @@
 
 CLEANFILES+=	${THRHDRS}
 
+.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
@@ -626,3 +637,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/libstdc++/config.h
===================================================================
--- trunk/gnu/lib/libstdc++/config.h	2017-12-13 21:40:26 UTC (rev 9682)
+++ trunk/gnu/lib/libstdc++/config.h	2017-12-16 05:24:14 UTC (rev 9683)
@@ -1,4 +1,5 @@
-/* $FreeBSD: src/gnu/lib/libstdc++/config.h,v 1.15 2007/05/19 04:25:56 kan Exp $ */
+/* $MidnightBSD$ */
+/* $FreeBSD: stable/10/gnu/lib/libstdc++/config.h 254295 2013-08-13 20:28:21Z pfg $ */
 #ifndef __ISO_C_VISIBLE
 #include <sys/cdefs.h>
 #endif
@@ -67,7 +68,7 @@
 #define HAVE_EXPF 1
 
 /* Define to 1 if you have the `expl' function. */
-/* #undef HAVE_EXPL 1 */
+#define HAVE_EXPL 1
 
 /* Define to 1 if you have the `fabsf' function. */
 #define HAVE_FABSF 1
@@ -212,13 +213,13 @@
 #define HAVE_LOG10F 1
 
 /* Define to 1 if you have the `log10l' function. */
-/* #undef HAVE_LOG10L */
+#define HAVE_LOG10L 1
 
 /* Define to 1 if you have the `logf' function. */
 #define HAVE_LOGF 1
 
 /* Define to 1 if you have the `logl' function. */
-/* #undef HAVE_LOGL */
+#define HAVE_LOGL 1
 
 /* Define to 1 if you have the <machine/endian.h> header file. */
 #define HAVE_MACHINE_ENDIAN_H 1
@@ -380,7 +381,9 @@
 /* #undef HAVE_TANL */
 
 /* Define to 1 if the target supports thread-local storage. */
+#if !defined(__mips__)
 #define HAVE_TLS 1
+#endif
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #define HAVE_UNISTD_H 1