From owner-svn-src-all@FreeBSD.ORG  Thu Feb 26 07:42:17 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 17A494CD;
 Thu, 26 Feb 2015 07:42:17 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 02F0C9BE;
 Thu, 26 Feb 2015 07:42:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1Q7gGHh033029;
 Thu, 26 Feb 2015 07:42:16 GMT (envelope-from dim@FreeBSD.org)
Received: (from dim@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1Q7gGmS033028;
 Thu, 26 Feb 2015 07:42:16 GMT (envelope-from dim@FreeBSD.org)
Message-Id: <201502260742.t1Q7gGmS033028@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org
 using -f
From: Dimitry Andric <dim@FreeBSD.org>
Date: Thu, 26 Feb 2015 07:42:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r279310 - 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.18-1
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: Thu, 26 Feb 2015 07:42:17 -0000

Author: dim
Date: Thu Feb 26 07:42:16 2015
New Revision: 279310
URL: https://svnweb.freebsd.org/changeset/base/279310

Log:
  Since newer versions of compiler-rt require unwind.h, and we want to use
  the copy in libcxxrt for it, fix the arm-specific header to define the
  _Unwind_Action type.
  
  Submitted by:	andrew
  MFC after:	3 days

Modified:
  head/contrib/libcxxrt/unwind-arm.h

Modified: head/contrib/libcxxrt/unwind-arm.h
==============================================================================
--- head/contrib/libcxxrt/unwind-arm.h	Thu Feb 26 07:26:56 2015	(r279309)
+++ head/contrib/libcxxrt/unwind-arm.h	Thu Feb 26 07:42:16 2015	(r279310)
@@ -36,6 +36,8 @@
 	_URC_FATAL_PHASE1_ERROR = _URC_FAILURE
 } _Unwind_Reason_Code;
 
+typedef int _Unwind_Action;
+
 typedef uint32_t _Unwind_State;
 #ifdef __clang__
 static const _Unwind_State _US_VIRTUAL_UNWIND_FRAME  = 0;