mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-24 14:41:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/ia64/bits/setjmp.h (_JMPBUF_UNWINDS):

Browse Source 
Don't use _demangle parameter for now.
This commit is contained in:
Ulrich Drepper 2005-12-30 18:29:30 +00:00
parent b5352f2d51
commit b36205c4ab
4 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2005-12-30 Ulrich Drepper <drepper@redhat.com> 2005-12-30 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/ia64/bits/setjmp.h (_JMPBUF_UNWINDS):
Don't use _demangle parameter for now.
[BZ #2080] [BZ #2080]
* libio/iogetwline.c (_IO_getwline_info): Move return to correct * libio/iogetwline.c (_IO_getwline_info): Move return to correct
location. location.

5
nptl/ChangeLog
View File

@ -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> 2005-12-29 Ulrich Drepper <drepper@redhat.com>
* sysdeps/pthread/sigaction.c: Removed. * sysdeps/pthread/sigaction.c: Removed.

25
nptl/sysdeps/unix/sysv/linux/ia64/jmpbuf-unwind.h
View File

@ -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. This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. Contributed by Jakub Jelinek <jakub@redhat.com>, 2003.
@ -21,23 +21,12 @@
#include <stdint.h> #include <stdint.h>
#include <unwind.h> #include <unwind.h>
static inline uintptr_t __attribute__ ((unused)) #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
_jmpbuf_sp (__jmp_buf regs, int i) ({ uintptr_t _cfa = (uintptr_t) _Unwind_GetCFA (_context) - (_adj); \
{ (_cfa < (uintptr_t)(((long *)(_jmpbuf))[0]) - (_adj) \
uintptr_t sp = ((unsigned long int *) regs)[i]; || (_cfa == (uintptr_t)(((long *)(_jmpbuf))[0]) - (_adj) \
#ifdef PTR_DEMANGLE && (uintptr_t) _Unwind_GetBSP (_context) - (_adj) \
PTR_DEMANGLE (sp); >= (uintptr_t)(((long *)(_jmpbuf))[17]) - (_adj))); \
#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_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \

2
sysdeps/unix/sysv/linux/ia64/bits/setjmp.h
View File

@ -35,6 +35,6 @@ typedef long __jmp_buf[_JBLEN] __attribute__ ((aligned (16))); /* guarantees 128
/* Test if longjmp to JMPBUF would unwind the frame containing a local /* Test if longjmp to JMPBUF would unwind the frame containing a local
variable at ADDRESS. */ variable at ADDRESS. */
#define _JMPBUF_UNWINDS(_jmpbuf, _address, _demangle) \ #define _JMPBUF_UNWINDS(_jmpbuf, _address, _demangle) \
((void *) (_address) < (void *) demangle (((long int *) _jmpbuf)[0])) ((void *) (_address) < (void *) (((long int *) _jmpbuf)[0]))
#endif /* bits/setjmp.h */ #endif /* bits/setjmp.h */