svn commit: r233756 - projects/arm_eabi/gnu/lib/libstdc++

[Andrew Turner]

Author: andrew
Date: Sun Apr  1 08:58:21 2012
New Revision: 233756
URL: http://svn.freebsd.org/changeset/base/233756

Log:
  Use the correct C++ exception and unwind support for AEABI.

Modified:
  projects/arm_eabi/gnu/lib/libstdc++/Makefile

Modified: projects/arm_eabi/gnu/lib/libstdc++/Makefile
==============================================================================
--- projects/arm_eabi/gnu/lib/libstdc++/Makefile	Sun Apr  1 08:40:52 2012	(r233755)
+++ projects/arm_eabi/gnu/lib/libstdc++/Makefile	Sun Apr  1 08:58:21 2012	(r233756)
@@ -15,7 +15,7 @@ SHLIB_MAJOR=	6
 
 CFLAGS+=	-DIN_GLIBCPP_V3 -DHAVE_CONFIG_H
 .if ${MACHINE_CPUARCH} == "arm"
-CFLAGS+=	-D_GLIBCXX_SJLJ_EXCEPTIONS=1
+#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.
@@ -594,7 +594,13 @@ gthr-default.h: ${GCCDIR}/gthr-posix.h
 
 CLEANFILES+=	${THRHDRS}
 
+.if ${MACHINE_CPUARCH} == "arm"
+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