From owner-svn-src-projects@FreeBSD.ORG  Sun Apr  1 08:58:21 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id B5E1D106564A;
	Sun,  1 Apr 2012 08:58:21 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A184C8FC16;
	Sun,  1 Apr 2012 08:58:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q318wL1U041504;
	Sun, 1 Apr 2012 08:58:21 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q318wLAB041502;
	Sun, 1 Apr 2012 08:58:21 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201204010858.q318wLAB041502@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Sun, 1 Apr 2012 08:58:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233756 - projects/arm_eabi/gnu/lib/libstdc++
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Apr 2012 08:58:21 -0000

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