Date: Thu, 30 Sep 2010 12:59:56 +0000 (UTC) From: David Xu <davidxu@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213297 - head/lib/libthr/thread Message-ID: <201009301259.o8UCxuWv069896@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201009301259.o8UCxuWv069896>