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