svn commit: r248624 - head/gnu/lib/libsupc++

[Olivier Houchard]

Author: cognet
Date: Fri Mar 22 21:50:32 2013
New Revision: 248624
URL: http://svnweb.freebsd.org/changeset/base/248624

Log:
  As it's done for libstdc++, use SJLJ-based exceptions on arm when we're not
  using EABI, and use unwind-arm.h instead of unwind-generic.h when using EABI.

Modified:
  head/gnu/lib/libsupc++/Makefile

Modified: head/gnu/lib/libsupc++/Makefile
==============================================================================
--- head/gnu/lib/libsupc++/Makefile	Fri Mar 22 21:45:28 2013	(r248623)
+++ head/gnu/lib/libsupc++/Makefile	Fri Mar 22 21:50:32 2013	(r248624)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
 GCCVER=	4.2
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -20,6 +22,9 @@ SRCS+=	del_op.cc del_opnt.cc del_opv.cc 
 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
@@ -30,7 +35,13 @@ HDRS=	exception new typeinfo cxxabi.h ex
 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