aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--elf/dl-error.c2
-rw-r--r--sysdeps/generic/unwind-dw2.c6
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28c5e4a..9bb15ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
diff --git a/elf/dl-error.c b/elf/dl-error.c
index b5374e9..79ebaaf 100644
--- a/elf/dl-error.c
+++ b/elf/dl-error.c
@@ -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
{
diff --git a/sysdeps/generic/unwind-dw2.c b/sysdeps/generic/unwind-dw2.c
index 619250e..301b531 100644
--- a/sysdeps/generic/unwind-dw2.c
+++ b/sysdeps/generic/unwind-dw2.c
@@ -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;