yann@1201: Original patch from: gentoo/src/patchsets/glibc/2.9/6018_all_glibc-ptr-mangling.patch
yann@1201: 
yann@1201: -= BEGIN original header =-
yann@1201: http://bugs.gentoo.org/201910
yann@1201: 
yann@1201: For every arch, PTR_MANGLE and PTR_DEMANGLE defines are in
yann@1201: sysdeps/unix/sysv/linux/<arch>/sysdep.h. But for alpha this is not true. The
yann@1201: defines are in sysdeps/unix/alpha/sysdep.h and unix/sysv/linux/alpha/sysdep.h
yann@1201: includes the first.
yann@1201: 
yann@1201: This is a patch that fixes the issue and let alpha build, at the expense of
yann@1201: disabling MANGLING in the non PIC case, but googling showed that the issue is
yann@1201: known, and that nobody really cares about it. 
yann@1201: 
yann@1201: Info from: http://sourceware.org/bugzilla/show_bug.cgi?id=5216
yann@1201: 
yann@1201: -= END original header =-
yann@1201: 
yann@1201: diff -durN glibc-2_9.orig/sysdeps/unix/alpha/sysdep.h glibc-2_9/sysdeps/unix/alpha/sysdep.h
yann@1201: --- glibc-2_9.orig/sysdeps/unix/alpha/sysdep.h	2006-03-03 12:21:28.000000000 +0100
yann@1201: +++ glibc-2_9/sysdeps/unix/alpha/sysdep.h	2009-02-02 22:01:39.000000000 +0100
yann@1201: @@ -397,42 +397,4 @@
yann@1201:  	_sc_ret = _sc_0, _sc_err = _sc_19;			\
yann@1201:  }
yann@1201:  
yann@1201: -/* Pointer mangling support.  Note that tls access is slow enough that
yann@1201: -   we don't deoptimize things by placing the pointer check value there.  */
yann@1201: -
yann@1201: -#include <stdint.h>
yann@1201: -
yann@1201: -#if defined NOT_IN_libc && defined IS_IN_rtld
yann@1201: -# ifdef __ASSEMBLER__
yann@1201: -#  define PTR_MANGLE(dst, src, tmp)				\
yann@1201: -	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
yann@1201: -	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
yann@1201: -	xor	src, tmp, dst
yann@1201: -#  define PTR_MANGLE2(dst, src, tmp)				\
yann@1201: -	xor	src, tmp, dst
yann@1201: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@1201: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@1201: -# else
yann@1201: -extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@1201: -#  define PTR_MANGLE(var)	\
yann@1201: -  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@1201: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@1201: -# endif
yann@1201: -#elif defined PIC
yann@1201: -# ifdef __ASSEMBLER__
yann@1201: -#  define PTR_MANGLE(dst, src, tmp)		\
yann@1201: -	ldq	tmp, __pointer_chk_guard;	\
yann@1201: -	xor	src, tmp, dst
yann@1201: -#  define PTR_MANGLE2(dst, src, tmp)		\
yann@1201: -	xor	src, tmp, dst
yann@1201: -#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@1201: -#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@1201: -# else
yann@1201: -extern uintptr_t __pointer_chk_guard attribute_relro;
yann@1201: -#  define PTR_MANGLE(var)	\
yann@1201: -	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@1201: -#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@1201: -# endif
yann@1201: -#endif
yann@1201: -
yann@1201:  #endif /* ASSEMBLER */
yann@1201: diff -durN glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h glibc-2_9/sysdeps/unix/sysv/linux/alpha/sysdep.h
yann@1201: --- glibc-2_9.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h	2007-08-21 10:07:28.000000000 +0200
yann@1201: +++ glibc-2_9/sysdeps/unix/sysv/linux/alpha/sysdep.h	2009-02-02 22:01:39.000000000 +0100
yann@1201: @@ -98,4 +98,46 @@
yann@1201:  	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
yann@1201:  })
yann@1201:  
yann@1201: +/* Pointer mangling support.  Note that tls access is slow enough that
yann@1201: +   we don't deoptimize things by placing the pointer check value there.  */
yann@1201: +
yann@1201: +#if defined NOT_IN_libc && defined IS_IN_rtld
yann@1201: +# ifdef __ASSEMBLER__
yann@1201: +#  define PTR_MANGLE(dst, src, tmp)                            \
yann@1201: +       ldah    tmp, __pointer_chk_guard_local($29) !gprelhigh; \
yann@1201: +       ldq     tmp, __pointer_chk_guard_local(tmp) !gprellow;  \
yann@1201: +       xor     src, tmp, dst
yann@1201: +#  define PTR_MANGLE2(dst, src, tmp)                           \
yann@1201: +       xor     src, tmp, dst
yann@1201: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@1201: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@1201: +# else
yann@1201: +extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
yann@1201: +#  define PTR_MANGLE(var)      \
yann@1201: +  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
yann@1201: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@1201: +# endif
yann@1201: +#elif defined PIC
yann@1201: +# ifdef __ASSEMBLER__
yann@1201: +#  define PTR_MANGLE(dst, src, tmp)            \
yann@1201: +       ldq     tmp, __pointer_chk_guard;       \
yann@1201: +       xor     src, tmp, dst
yann@1201: +#  define PTR_MANGLE2(dst, src, tmp)           \
yann@1201: +       xor     src, tmp, dst
yann@1201: +#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
yann@1201: +#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
yann@1201: +# else
yann@1201: +extern uintptr_t __pointer_chk_guard attribute_relro;
yann@1201: +#  define PTR_MANGLE(var)      \
yann@1201: +       (var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
yann@1201: +#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
yann@1201: +# endif
yann@1201: +#else
yann@1201: +/* Pointer mangling is not yet supported for static libc on alpha.  */
yann@1201: +# ifndef __ASSEMBLER__
yann@1201: +#  define PTR_MANGLE(var)   (void) (var)
yann@1201: +#  define PTR_DEMANGLE(var) (void) (var)
yann@1201: +# endif
yann@1201: +#endif
yann@1201: +
yann@1201:  #endif /* _LINUX_ALPHA_SYSDEP_H */