diff options
Diffstat (limited to 'contrib/gcc/unwind-sjlj.c')
-rw-r--r-- | contrib/gcc/unwind-sjlj.c | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/contrib/gcc/unwind-sjlj.c b/contrib/gcc/unwind-sjlj.c index 7b52338..505bb86 100644 --- a/contrib/gcc/unwind-sjlj.c +++ b/contrib/gcc/unwind-sjlj.c @@ -1,5 +1,5 @@ -/* DWARF2 exception handling and frame unwind runtime interface routines. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +/* SJLJ exception handling and frame unwind runtime interface routines. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -9,6 +9,15 @@ the Free Software Foundation; either version 2, or (at your option) any later version. + In addition to the permissions in the GNU General Public License, the + Free Software Foundation gives you unlimited permission to link the + compiled version of this file into combinations with other programs, + and to distribute those combinations without any restriction coming + from the use of this file. (The General Public License restrictions + do apply in other respects; for example, they cover modification of + the file, and distribution when not linked into a combined + executable.) + GCC is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public @@ -21,6 +30,8 @@ #include "tconfig.h" #include "tsystem.h" +#include "coretypes.h" +#include "tm.h" #include "unwind.h" #include "gthr.h" @@ -92,15 +103,9 @@ static __gthread_key_t fc_key; static int use_fc_key = -1; static void -fc_key_dtor (void *ptr) -{ - __gthread_key_dtor (fc_key, ptr); -} - -static void fc_key_init (void) { - use_fc_key = __gthread_key_create (&fc_key, fc_key_dtor) == 0; + use_fc_key = __gthread_key_create (&fc_key, 0) == 0; } static void @@ -177,10 +182,10 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) /* Get the value of the CFA as saved in CONTEXT. */ _Unwind_Word -_Unwind_GetCFA (struct _Unwind_Context *context) +_Unwind_GetCFA (struct _Unwind_Context *context __attribute__((unused))) { /* ??? Ideally __builtin_setjmp places the CFA in the jmpbuf. */ - return NULL; + return (_Unwind_Word) 0; } void @@ -218,7 +223,7 @@ _Unwind_GetRegionStart (struct _Unwind_Context *context __attribute__((unused)) } void * -_Unwind_FindEnclosingFunction (void *pc) +_Unwind_FindEnclosingFunction (void *pc __attribute__((unused))) { return NULL; } |