From owner-svn-src-all@FreeBSD.ORG  Sat Aug 31 08:56:34 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 70218305;
 Sat, 31 Aug 2013 08:56:34 +0000 (UTC)
 (envelope-from theraven@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 5C4982450;
 Sat, 31 Aug 2013 08:56:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7V8uY1d024582;
 Sat, 31 Aug 2013 08:56:34 GMT
 (envelope-from theraven@svn.freebsd.org)
Received: (from theraven@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7V8uY1N024581;
 Sat, 31 Aug 2013 08:56:34 GMT
 (envelope-from theraven@svn.freebsd.org)
Message-Id: <201308310856.r7V8uY1N024581@svn.freebsd.org>
From: David Chisnall <theraven@FreeBSD.org>
Date: Sat, 31 Aug 2013 08:56:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r255093 - head/contrib/libcxxrt
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 31 Aug 2013 08:56:34 -0000

Author: theraven
Date: Sat Aug 31 08:56:33 2013
New Revision: 255093
URL: http://svnweb.freebsd.org/changeset/base/255093

Log:
  Don't use _Unwind_Backtrace() on ARM as it's currently missing from our libgcc_s.  andrew@ has patches to add it, so this can be reverted and sync'd with upstream later.

Modified:
  head/contrib/libcxxrt/exception.cc

Modified: head/contrib/libcxxrt/exception.cc
==============================================================================
--- head/contrib/libcxxrt/exception.cc	Sat Aug 31 08:50:45 2013	(r255092)
+++ head/contrib/libcxxrt/exception.cc	Sat Aug 31 08:56:33 2013	(r255093)
@@ -715,7 +715,9 @@ static void report_failure(_Unwind_Reaso
 			if (status == 0) { free(demangled); }
 			// Print a back trace if no handler is found.
 			// TODO: Make this optional
+#ifndef __arm__
 			_Unwind_Backtrace(trace, 0);
+#endif
 			break;
 	}
 	std::terminate();