mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-30 22:43:12 +03:00
* sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h (PTR_MANGLE,
PTR_MANGLE2, PTR_DEMANGLE, PTR_DEMANGLE2): Define. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h (PTR_MANGLE, PTR_MANGLE2, PTR_DEMANGLE, PTR_DEMANGLE2): Define. * sysdeps/unix/sysv/linux/sparc/bits/setjmp.h [__WORDSIZE == 64] (_JMPBUF_UNWINDS): Don't demangle uc_mcontext.mc_fp. * sysdeps/sparc/sparc32/setjmp.S (__sigsetjmp): Mangle %fp, %sp and %o7. * sysdeps/sparc/sparc32/__longjmp.S (__longjmp): Demangle %fp, %sp and %o7. 2006-01-02 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (PTR_MANGLE2): Define. * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (PTR_MANGLE2): Likewise. * sysdeps/s390/s390-32/__longjmp.c (__longjmp): Demangle also %r15. * sysdeps/s390/s390-64/__longjmp.c (__longjmp): Likewise. * sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Mangle also %r15. * sysdeps/s390/s390-32/elf/setjmp.S (__sigsetjmp): Likewise. * sysdeps/s390/s390-64/setjmp.S (__sigsetjmp): Likewise. * sysdeps/s390/s390-64/elf/setjmp.S (__sigsetjmp): Likewise. * sysdeps/s390/bits/setjmp.h (__jmp_buf): Add __s390_jmp_buf struct tag to make C++ happy. 2006-01-02 Ulrich Drepper <drepper@redhat.com> * posix/Makefile ($(objpfx)annexc.out): Move -I.. to the end of the include list.
This commit is contained in:
@ -1,4 +1,5 @@
|
||||
/* Copyright (C) 1997,1999,2000,2003, 2005 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997, 1999, 2000, 2003, 2005, 2006
|
||||
Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
|
||||
The GNU C Library is free software; you can redistribute it and/or
|
||||
@ -60,7 +61,7 @@ typedef struct __sparc64_jmp_buf
|
||||
/* Test if longjmp to JMPBUF would unwind the frame
|
||||
containing a local variable at ADDRESS. */
|
||||
#define _JMPBUF_UNWINDS(jmpbuf, address, demangle) \
|
||||
((unsigned long int) (address) < demangle ((jmpbuf)->uc_mcontext.mc_fp))
|
||||
((unsigned long int) (address) < (jmpbuf)->uc_mcontext.mc_fp)
|
||||
|
||||
#else
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Miguel de Icaza <miguel@gnu.ai.mit.edu>, January 1997.
|
||||
|
||||
@ -214,4 +214,24 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
||||
|
||||
#endif /* __ASSEMBLER__ */
|
||||
|
||||
/* Pointer mangling support. */
|
||||
#if defined NOT_IN_libc && defined IS_IN_rtld
|
||||
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
||||
earlier than the descriptor is initialized. */
|
||||
#else
|
||||
# ifdef __ASSEMBLER__
|
||||
# define PTR_MANGLE(dreg, reg, tmpreg) \
|
||||
ld [%g7 + POINTER_GUARD], tmpreg; \
|
||||
xor reg, tmpreg, dreg
|
||||
# define PTR_DEMANGLE(dreg, reg, tmpreg) PTR_MANGLE (dreg, reg, tmpreg)
|
||||
# define PTR_MANGLE2(dreg, reg, tmpreg) \
|
||||
xor reg, tmpreg, dreg
|
||||
# define PTR_DEMANGLE2(dreg, reg, tmpreg) PTR_MANGLE2 (dreg, reg, tmpreg)
|
||||
# else
|
||||
# define PTR_MANGLE(var) \
|
||||
(var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())
|
||||
# define PTR_DEMANGLE(var) PTR_MANGLE (var)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* linux/sparc/sysdep.h */
|
||||
|
@ -240,4 +240,24 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
||||
register windows. So if you poke stack memory directly you add this. */
|
||||
#define STACK_BIAS 2047
|
||||
|
||||
/* Pointer mangling support. */
|
||||
#if defined NOT_IN_libc && defined IS_IN_rtld
|
||||
/* We cannot use the thread descriptor because in ld.so we use setjmp
|
||||
earlier than the descriptor is initialized. */
|
||||
#else
|
||||
# ifdef __ASSEMBLER__
|
||||
# define PTR_MANGLE(dreg, reg, tmpreg) \
|
||||
ldx [%g7 + POINTER_GUARD], tmpreg; \
|
||||
xor reg, tmpreg, dreg
|
||||
# define PTR_DEMANGLE(dreg, reg, tmpreg) PTR_MANGLE (dreg, reg, tmpreg)
|
||||
# define PTR_MANGLE2(dreg, reg, tmpreg) \
|
||||
xor reg, tmpreg, dreg
|
||||
# define PTR_DEMANGLE2(dreg, reg, tmpreg) PTR_MANGLE2 (dreg, reg, tmpreg)
|
||||
# else
|
||||
# define PTR_MANGLE(var) \
|
||||
(var) = (__typeof (var)) ((uintptr_t) (var) ^ THREAD_GET_POINTER_GUARD ())
|
||||
# define PTR_DEMANGLE(var) PTR_MANGLE (var)
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#endif /* linux/sparc64/sysdep.h */
|
||||
|
Reference in New Issue
Block a user