aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-30 18:29:30 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-30 18:29:30 +0000
commitb36205c4ab71222bf11fba59114f98fec8348777 (patch)
treeaf5720ebfa4f3d9e976b6efca4f643bfee39181f /nptl
parentb5352f2d51056bf47eca9ba8378656786eb06baa (diff)
downloadglibc-b36205c4ab71222bf11fba59114f98fec8348777.zip
glibc-b36205c4ab71222bf11fba59114f98fec8348777.tar.gz
glibc-b36205c4ab71222bf11fba59114f98fec8348777.tar.bz2
* sysdeps/unix/sysv/linux/ia64/bits/setjmp.h (_JMPBUF_UNWINDS):
Don't use _demangle parameter for now.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h25
2 files changed, 12 insertions, 18 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index f7a70a6..9d10889 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-30 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h: Undo last change for
+ now.
+
2005-12-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/sigaction.c: Removed.
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h b/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h
index 61411bd..c6ef5f7 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
@@ -21,23 +21,12 @@
#include <stdint.h>
#include <unwind.h>
-static inline uintptr_t __attribute__ ((unused))
-_jmpbuf_sp (__jmp_buf regs, int i)
-{
- uintptr_t sp = ((unsigned long int *) regs)[i];
-#ifdef PTR_DEMANGLE
- PTR_DEMANGLE (sp);
-#endif
- return sp;
-}
-
-
-#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
- ({ uintptr_t _cfa = (uintptr_t) _Unwind_GetCFA (_context) - (_adj); \
- (_cfa < _jmpbuf_sp (_jmpbuf, 0) - (_adj) \
- || (_cfa == (uintptr_t)(((long *)(_jmpbuf))[0]) - (_adj) \
- && ((uintptr_t) _Unwind_GetBSP (_context) - (_adj) \
- >= _jmpbuf_sp (_jmpbuf, 17) - (_adj)))); \
+#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
+ ({ uintptr_t _cfa = (uintptr_t) _Unwind_GetCFA (_context) - (_adj); \
+ (_cfa < (uintptr_t)(((long *)(_jmpbuf))[0]) - (_adj) \
+ || (_cfa == (uintptr_t)(((long *)(_jmpbuf))[0]) - (_adj) \
+ && (uintptr_t) _Unwind_GetBSP (_context) - (_adj) \
+ >= (uintptr_t)(((long *)(_jmpbuf))[17]) - (_adj))); \
})
#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \