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

* sysdeps/generic/unwind-dw2.c (extract_cie_info): Add a cast. 

* elf/dl-error.c (_dl_signal_error): Use .__jmpbuf in __longjmp call.
This commit is contained in:
Roland McGrath 2005-12-21 21:36:24 +00:00
parent 934b22a4f6
commit e8ebf3f2dc
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-12-21 Roland McGrath <roland@redhat.com>
* sysdeps/generic/unwind-dw2.c (extract_cie_info): Add a cast.
* elf/dl-error.c (_dl_signal_error): Use .__jmpbuf in __longjmp call.
* csu/dso_handle.c (__dso_handle): Add const to pointer type too.
2005-12-21 Ulrich Drepper <drepper@redhat.com>

2
elf/dl-error.c
View File

@ -113,7 +113,7 @@ _dl_signal_error (int errcode, const char *objname, const char *occation,
lcatch->malloced = false;
}
/* We do not restore the signal mask because none was saved. */
__longjmp (lcatch->env, errcode ?: -1);
__longjmp (lcatch->env[0].__jmpbuf, errcode ?: -1);
}
else
{

6
sysdeps/generic/unwind-dw2.c
View File

@ -1,6 +1,6 @@
/* DWARF2 exception handling and frame unwind runtime interface routines.
Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
Free Software Foundation, Inc.
Copyright (C) 1997,1998,1999,2000,2001,2002,2003,2005
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@ -256,7 +256,7 @@ extract_cie_info (struct dwarf_cie *cie, struct _Unwind_Context *context,
_Unwind_FrameState *fs)
{
const unsigned char *aug = cie->augmentation;
const unsigned char *p = aug + strlen (aug) + 1;
const unsigned char *p = aug + strlen ((const char *) aug) + 1;
const unsigned char *ret = NULL;
_Unwind_Word utmp;