yann@734: --- glibc-2.7.orig/sysdeps/unix/alpha/sysdep.h
yann@734: +++ glibc-2.7/sysdeps/unix/alpha/sysdep.h
yann@734: @@ -397,42 +397,4 @@
yann@734:  	_sc_ret = _sc_0, _sc_err = _sc_19;			\
yann@734:  }
yann@734:  
yann@734: -/* Pointer mangling support.  Note that tls access is slow enough that
yann@734: -   we don't deoptimize things by placing the pointer check value there.  */
yann@734: -
yann@734: -#include <stdint.h>
yann@734: -
yann@734: -#if defined NOT_IN_libc && defined IS_IN_rtld
yann@734: -# ifdef __ASSEMBLER__
yann@734: -#  define PTR_MANGLE(dst, src, tmp)				\
yann@734: -	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
yann@734: -	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
yann@734: -	xor	src, tmp, dst
yann@734: -#  define PTR_MANGLE2(dst, src, tmp)				\
yann@734: -	xor	src, tmp, dst
yann@734: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@734: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@734: -# else
yann@734: -extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@734: -#  define PTR_MANGLE(var)	\
yann@734: -  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@734: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@734: -# endif
yann@734: -#elif defined PIC
yann@734: -# ifdef __ASSEMBLER__
yann@734: -#  define PTR_MANGLE(dst, src, tmp)		\
yann@734: -	ldq	tmp, __pointer_chk_guard;	\
yann@734: -	xor	src, tmp, dst
yann@734: -#  define PTR_MANGLE2(dst, src, tmp)		\
yann@734: -	xor	src, tmp, dst
yann@734: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@734: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@734: -# else
yann@734: -extern uintptr_t __pointer_chk_guard attribute_relro;
yann@734: -#  define PTR_MANGLE(var)	\
yann@734: -	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@734: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@734: -# endif
yann@734: -#endif
yann@734: -
yann@734:  #endif /* ASSEMBLER */
yann@734: --- glibc-2.7.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h
yann@734: +++ glibc-2.7/sysdeps/unix/sysv/linux/alpha/sysdep.h
yann@734: @@ -98,4 +98,46 @@
yann@734:  	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
yann@734:  })
yann@734:  
yann@734: +/* Pointer mangling support.  Note that tls access is slow enough that
yann@734: +   we don't deoptimize things by placing the pointer check value there.  */
yann@734: +
yann@734: +#if defined NOT_IN_libc && defined IS_IN_rtld
yann@734: +# ifdef __ASSEMBLER__
yann@734: +#  define PTR_MANGLE(dst, src, tmp)				\
yann@734: +	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
yann@734: +	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
yann@734: +	xor	src, tmp, dst
yann@734: +#  define PTR_MANGLE2(dst, src, tmp)				\
yann@734: +	xor	src, tmp, dst
yann@734: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@734: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@734: +# else
yann@734: +extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@734: +#  define PTR_MANGLE(var)	\
yann@734: +  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@734: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@734: +# endif
yann@734: +#elif defined PIC
yann@734: +# ifdef __ASSEMBLER__
yann@734: +#  define PTR_MANGLE(dst, src, tmp)		\
yann@734: +	ldq	tmp, __pointer_chk_guard;	\
yann@734: +	xor	src, tmp, dst
yann@734: +#  define PTR_MANGLE2(dst, src, tmp)		\
yann@734: +	xor	src, tmp, dst
yann@734: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@734: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@734: +# else
yann@734: +extern uintptr_t __pointer_chk_guard attribute_relro;
yann@734: +#  define PTR_MANGLE(var)	\
yann@734: +	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@734: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@734: +# endif
yann@734: +#else
yann@734: +/* Pointer mangling is not yet supported for static libc on alpha.  */
yann@734: +# ifndef __ASSEMBLER__
yann@734: +#  define PTR_MANGLE(var)   (void) (var)
yann@734: +#  define PTR_DEMANGLE(var) (void) (var)
yann@734: +# endif
yann@734: +#endif
yann@734: +
yann@734:  #endif /* _LINUX_ALPHA_SYSDEP_H */