From owner-svn-src-head@FreeBSD.ORG  Thu Sep 30 12:59:57 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 009181065670;
	Thu, 30 Sep 2010 12:59:57 +0000 (UTC)
	(envelope-from davidxu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CA1688FC16;
	Thu, 30 Sep 2010 12:59:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8UCxuHK069899;
	Thu, 30 Sep 2010 12:59:56 GMT (envelope-from davidxu@svn.freebsd.org)
Received: (from davidxu@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8UCxuWv069896;
	Thu, 30 Sep 2010 12:59:56 GMT (envelope-from davidxu@svn.freebsd.org)
Message-Id: <201009301259.o8UCxuWv069896@svn.freebsd.org>
From: David Xu <davidxu@FreeBSD.org>
Date: Thu, 30 Sep 2010 12:59:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213297 - head/lib/libthr/thread
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2010 12:59:57 -0000

Author: davidxu
Date: Thu Sep 30 12:59:56 2010
New Revision: 213297
URL: http://svn.freebsd.org/changeset/base/213297

Log:
  change code to use unwind.h.

Modified:
  head/lib/libthr/thread/thr_exit.c
  head/lib/libthr/thread/thr_private.h

Modified: head/lib/libthr/thread/thr_exit.c
==============================================================================
--- head/lib/libthr/thread/thr_exit.c	Thu Sep 30 11:43:54 2010	(r213296)
+++ head/lib/libthr/thread/thr_exit.c	Thu Sep 30 12:59:56 2010	(r213297)
@@ -58,13 +58,13 @@ static void thread_unwind(void) __dead2;
 static void thread_uw_init(void);
 static _Unwind_Reason_Code thread_unwind_stop(int version,
 	_Unwind_Action actions,
-	_Unwind_Exception_Class exc_class,
+	int64_t exc_class,
 	struct _Unwind_Exception *exc_obj,
 	struct _Unwind_Context *context, void *stop_parameter);
 /* unwind library pointers */
 static _Unwind_Reason_Code (*uwl_forcedunwind)(struct _Unwind_Exception *,
 	_Unwind_Stop_Fn, void *);
-static _Unwind_Word (*uwl_getcfa)(struct _Unwind_Context *);
+static unsigned long (*uwl_getcfa)(struct _Unwind_Context *);
 
 static void
 thread_uw_init(void)
@@ -106,7 +106,7 @@ _Unwind_ForcedUnwind(struct _Unwind_Exce
 	return (*uwl_forcedunwind)(ex, stop_func, stop_arg);
 }
 
-_Unwind_Word
+unsigned long
 _Unwind_GetCFA(struct _Unwind_Context *context)
 {
 	return (*uwl_getcfa)(context);
@@ -129,7 +129,7 @@ thread_unwind_cleanup(_Unwind_Reason_Cod
 
 static _Unwind_Reason_Code
 thread_unwind_stop(int version, _Unwind_Action actions,
-	_Unwind_Exception_Class exc_class,
+	int64_t exc_class,
 	struct _Unwind_Exception *exc_obj,
 	struct _Unwind_Context *context, void *stop_parameter)
 {

Modified: head/lib/libthr/thread/thr_private.h
==============================================================================
--- head/lib/libthr/thread/thr_private.h	Thu Sep 30 11:43:54 2010	(r213296)
+++ head/lib/libthr/thread/thr_private.h	Thu Sep 30 12:59:56 2010	(r213297)
@@ -71,7 +71,8 @@
 #include "thread_db.h"
 
 #ifdef _PTHREAD_FORCED_UNWIND
-#include <unwind-generic.h>
+#define _BSD_SOURCE
+#include <unwind.h>
 #endif
 
 typedef TAILQ_HEAD(pthreadlist, pthread) pthreadlist;