yann@748: --- glibc-2.6.1.orig/sysdeps/unix/alpha/sysdep.h
yann@748: +++ glibc-2.6.1/sysdeps/unix/alpha/sysdep.h
yann@748: @@ -397,42 +397,4 @@
yann@748:  	_sc_ret = _sc_0, _sc_err = _sc_19;			\
yann@748:  }
yann@748:  
yann@748: -/* Pointer mangling support.  Note that tls access is slow enough that
yann@748: -   we don't deoptimize things by placing the pointer check value there.  */
yann@748: -
yann@748: -#include <stdint.h>
yann@748: -
yann@748: -#if defined NOT_IN_libc && defined IS_IN_rtld
yann@748: -# ifdef __ASSEMBLER__
yann@748: -#  define PTR_MANGLE(dst, src, tmp)				\
yann@748: -	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
yann@748: -	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
yann@748: -	xor	src, tmp, dst
yann@748: -#  define PTR_MANGLE2(dst, src, tmp)				\
yann@748: -	xor	src, tmp, dst
yann@748: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@748: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@748: -# else
yann@748: -extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@748: -#  define PTR_MANGLE(var)	\
yann@748: -  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@748: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@748: -# endif
yann@748: -#elif defined PIC
yann@748: -# ifdef __ASSEMBLER__
yann@748: -#  define PTR_MANGLE(dst, src, tmp)		\
yann@748: -	ldq	tmp, __pointer_chk_guard;	\
yann@748: -	xor	src, tmp, dst
yann@748: -#  define PTR_MANGLE2(dst, src, tmp)		\
yann@748: -	xor	src, tmp, dst
yann@748: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@748: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@748: -# else
yann@748: -extern uintptr_t __pointer_chk_guard attribute_relro;
yann@748: -#  define PTR_MANGLE(var)	\
yann@748: -	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@748: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@748: -# endif
yann@748: -#endif
yann@748: -
yann@748:  #endif /* ASSEMBLER */
yann@748: --- glibc-2.6.1.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h
yann@748: +++ glibc-2.6.1/sysdeps/unix/sysv/linux/alpha/sysdep.h
yann@748: @@ -29,6 +29,8 @@
yann@748:  /* There is some commonality.  */
yann@748:  #include <sysdeps/unix/alpha/sysdep.h>
yann@748:  
yann@748: +#include <tls.h>
yann@748: +
yann@748:  /* For Linux we can use the system call table in the header file
yann@748:  	/usr/include/asm/unistd.h
yann@748:     of the kernel.  But these symbols do not follow the SYS_* syntax
yann@748: @@ -96,4 +96,46 @@
yann@748:  	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
yann@748:  })
yann@748:  
yann@748: +/* Pointer mangling support.  Note that tls access is slow enough that
yann@748: +   we don't deoptimize things by placing the pointer check value there.  */
yann@748: +
yann@748: +#if defined NOT_IN_libc && defined IS_IN_rtld
yann@748: +# ifdef __ASSEMBLER__
yann@748: +#  define PTR_MANGLE(dst, src, tmp)				\
yann@748: +	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
yann@748: +	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
yann@748: +	xor	src, tmp, dst
yann@748: +#  define PTR_MANGLE2(dst, src, tmp)				\
yann@748: +	xor	src, tmp, dst
yann@748: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@748: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@748: +# else
yann@748: +extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@748: +#  define PTR_MANGLE(var)	\
yann@748: +  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@748: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@748: +# endif
yann@748: +#elif defined PIC
yann@748: +# ifdef __ASSEMBLER__
yann@748: +#  define PTR_MANGLE(dst, src, tmp)		\
yann@748: +	ldq	tmp, __pointer_chk_guard;	\
yann@748: +	xor	src, tmp, dst
yann@748: +#  define PTR_MANGLE2(dst, src, tmp)		\
yann@748: +	xor	src, tmp, dst
yann@748: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@748: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@748: +# else
yann@748: +extern uintptr_t __pointer_chk_guard attribute_relro;
yann@748: +#  define PTR_MANGLE(var)	\
yann@748: +	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@748: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@748: +# endif
yann@748: +#else
yann@748: +/* Pointer mangling is not yet supported for static libc on alpha.  */
yann@748: +# ifndef __ASSEMBLER__
yann@748: +#  define PTR_MANGLE(var)   (void) (var)
yann@748: +#  define PTR_DEMANGLE(var) (void) (var)
yann@748: +# endif
yann@748: +#endif
yann@748: +
yann@748:  #endif /* _LINUX_ALPHA_SYSDEP_H */