OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

22003-09-04  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/unwind.h (_Unwind_GetBSP): Add prototype.

003-09-03  Ulrich Drepper  <drepper@redhat.com>
This commit is contained in:
Ulrich Drepper 2003-09-04 05:57:06 +00:00
parent 35504a6f2d
commit 58e8ec84f4
8 changed files with 117 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,4 +1,8 @@
2003-09-03 Ulrich Drepper <drepper@redhat.com>
22003-09-04 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/unwind.h (_Unwind_GetBSP): Add prototype.
003-09-03 Ulrich Drepper <drepper@redhat.com>
* nss/getXXbyYY_r.c (INTERNAL): Explicitly set errno and avoid
returning ERANGE if this wasn't intended.

11
nptl/ChangeLog
View File

@ -1,3 +1,14 @@
2003-09-04 Jakub Jelinek <jakub@redhat.com>
* unwind-forcedunwind.c: Move to...
* sysdeps/pthread/unwind-forcedunwind.c: ...here.
(pthread_cancel_init): Use ARCH_CANCEL_INIT if defined.
* sysdeps/pthread/jmpbuf-unwind.h: New file.
* sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c: New file.
* sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h: New file.
* unwind.c: Include jmpbuf-unwind.h.
(unwind_stop): Use _JMPBUF_CFA_UNWINDS macro.
2003-09-02 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/bits/local_lim.h: New file.

24
nptl/sysdeps/pthread/jmpbuf-unwind.h Normal file
View File

@ -0,0 +1,24 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <setjmp.h>
#include <unwind.h>
#define _JMPBUF_CFA_UNWINDS(_jmpbuf, _context) \
_JMPBUF_UNWINDS (_jmpbuf, (void *) _Unwind_GetCFA (_context))

6
nptl/unwind-forcedunwind.c → nptl/sysdeps/pthread/unwind-forcedunwind.c
View File

@ -46,7 +46,11 @@ pthread_cancel_init (void)
|| (personality = __libc_dlsym (handle, "__gcc_personality_v0")) == NULL
|| (forcedunwind = __libc_dlsym (handle, "_Unwind_ForcedUnwind"))
== NULL
|| (getcfa = __libc_dlsym (handle, "_Unwind_GetCFA")) == NULL)
|| (getcfa = __libc_dlsym (handle, "_Unwind_GetCFA")) == NULL
#ifdef ARCH_CANCEL_INIT
|| ARCH_CANCEL_INIT (handle)
#endif
)
__libc_fatal ("libgcc_s.so.1 must be installed for pthread_cancel to work\n");
libgcc_s_resume = resume;

29
nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h Normal file
View File

@ -0,0 +1,29 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <setjmp.h>
#include <unwind.h>
#define _JMPBUF_CFA_UNWINDS(_jmpbuf, _context) \
({ void *_cfa = (void *) _Unwind_GetCFA (_context); \
(_cfa < (void *)(((long *)(_jmpbuf))[0]) \
|| (_cfa == (void *)(((long *)(_jmpbuf))[0]) \
&& (void *) _Unwind_GetBSP (_context) \
>= (void *)(((long *)(_jmpbuf))[17]))); \
})

38
nptl/sysdeps/unix/sysv/linux/ia64/unwind-forcedunwind.c Normal file
View File

@ -0,0 +1,38 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation; either version 2.1 of the
License, or (at your option) any later version.
The GNU C Library 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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; see the file COPYING.LIB. If not,
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
#include <dlfcn.h>
#include <stdio.h>
#include <unwind.h>
#include <pthreadP.h>
static _Unwind_Word (*libgcc_s_getbsp) (struct _Unwind_Context *);
#define ARCH_CANCEL_INIT(handle) \
((libgcc_s_getbsp = __libc_dlsym (handle, "_Unwind_GetBSP")) == NULL)
#include <sysdeps/pthread/unwind-forcedunwind.c>
_Unwind_Word
_Unwind_GetBSP (struct _Unwind_Context *context)
{
if (__builtin_expect (libgcc_s_getbsp == NULL, 0))
pthread_cancel_init ();
return libgcc_s_getbsp (context);
}

5
nptl/unwind.c
View File

@ -23,7 +23,7 @@
#include <string.h>
#include <unistd.h>
#include "pthreadP.h"
#include "jmpbuf-unwind.h"
#ifdef HAVE_FORCED_UNWIND
@ -41,8 +41,7 @@ unwind_stop (int version, _Unwind_Action actions,
of a function is NOT within it's stack frame; it's the SP of the
previous frame. */
if ((actions & _UA_END_OF_STACK)
|| ! _JMPBUF_UNWINDS (buf->cancel_jmp_buf[0].jmp_buf,
_Unwind_GetCFA (context)))
|| ! _JMPBUF_CFA_UNWINDS (buf->cancel_jmp_buf[0].jmp_buf, context))
__libc_longjmp ((struct __jmp_buf_tag *) buf->cancel_jmp_buf, 1);
return _URC_NO_REASON;

3
sysdeps/generic/unwind.h
View File

@ -200,6 +200,9 @@ _Unwind_GetTextRelBase (struct _Unwind_Context *_C)
abort ();
return 0;
}
/* @@@ Retrieve the Backing Store Pointer of the given context. */
extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
#else
extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);