lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Fix jmpbuf unwind checks on sparc64.

Browse Source
This commit is contained in:
David S. Miller
2011-08-23 23:17:52 -07:00
parent 2cae499541
commit 2c0b250ae4
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2011-08-23 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc64/dl-machine.h (DL_STACK_END): Do not
subtract stack bias.
* sysdeps/sparc/sparc64/jmpbuf-unwind.h (_JMPBUF_UNWINDS): Use
%sp not %fp in calculations.
(_JMPBUF_UNWINDS_ADJ): Likewise.
2011-08-23 Andreas Schwab <schwab@redhat.com> 2011-08-23 Andreas Schwab <schwab@redhat.com>
* sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing * sysdeps/i386/i686/multiarch/strspn.S (ENTRY): Add missing

4
sysdeps/sparc/sparc64/dl-machine.h
View File

@ -264,9 +264,9 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
#define elf_machine_relplt elf_machine_rela #define elf_machine_relplt elf_machine_rela
/* Undo the sub %sp, 6*8, %sp; add %sp, STACK_BIAS + 22*8, %o0 below /* Undo the sub %sp, 6*8, %sp; add %sp, STACK_BIAS + 22*8, %o0 below
to get at the value we want in __libc_stack_end. */ (but w/o STACK_BIAS) to get at the value we want in __libc_stack_end. */
#define DL_STACK_END(cookie) \ #define DL_STACK_END(cookie) \
((void *) (((long) (cookie)) - (22 - 6) * 8 - STACK_BIAS)) ((void *) (((long) (cookie)) - (22 - 6) * 8))
/* Initial entry point code for the dynamic linker. /* Initial entry point code for the dynamic linker.
The C function `_dl_start' is the real entry point; The C function `_dl_start' is the real entry point;

4
sysdeps/sparc/sparc64/jmpbuf-unwind.h
View File

@ -24,14 +24,14 @@
/* Test if longjmp to JMPBUF would unwind the frame /* Test if longjmp to JMPBUF would unwind the frame
containing a local variable at ADDRESS. */ containing a local variable at ADDRESS. */
#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \ #define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \
((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_fp + 2047) ((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_gregs[MC_O6] + 2047)
#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \ #define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
_JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj) _JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \ #define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
((uintptr_t) (_address) - (_adj) \ ((uintptr_t) (_address) - (_adj) \
< (uintptr_t) (_jmpbuf)[0].uc_mcontext.mc_fp + 2047 - (_adj)) < (uintptr_t) (_jmpbuf)[0].uc_mcontext.mc_gregs[MC_O6] + 2047 - (_adj))
/* We use the normal lobngjmp for unwinding. */ /* We use the normal lobngjmp for unwinding. */
#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val) #define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)