complibs/ppl: update GMP location configuration argument for PPL v0.11 and later
'configure' for PPL 0.11 (and later) needs "--with-gmp-prefix" to
provide the location of the GMP toolkit; the previous switches were
"--with-libgmp-prefix" and "--with-libgmpxx-prefix".
The upstream log message is:
commit 08dfb6fea094f8c5a533575a3ea2095edce99a6d
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Sun Jul 12 21:39:46 2009 +0200
New configure option --with-gmp-prefix supersedes the (now removed)
options --with-libgmp-prefix and --with-libgmpxx-prefix.
Link: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=08dfb6fea094f8c5a533575a3ea2095edce99a6d
Since PPL's 'configure' ignores unknown switches, we use all three so we
don't have to conditionalize the ppl.sh build script itself.
Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 4f0c4fb572e2862c24b28e8d27ce7e9cb9adba65)
1 --- glibc-2.6.orig/sysdeps/unix/alpha/sysdep.h
2 +++ glibc-2.6/sysdeps/unix/alpha/sysdep.h
4 _sc_ret = _sc_0, _sc_err = _sc_19; \
7 -/* Pointer mangling support. Note that tls access is slow enough that
8 - we don't deoptimize things by placing the pointer check value there. */
12 -#if defined NOT_IN_libc && defined IS_IN_rtld
13 -# ifdef __ASSEMBLER__
14 -# define PTR_MANGLE(dst, src, tmp) \
15 - ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
16 - ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \
18 -# define PTR_MANGLE2(dst, src, tmp) \
20 -# define PTR_DEMANGLE(dst, tmp) PTR_MANGLE(dst, dst, tmp)
21 -# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
23 -extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
24 -# define PTR_MANGLE(var) \
25 - (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
26 -# define PTR_DEMANGLE(var) PTR_MANGLE(var)
29 -# ifdef __ASSEMBLER__
30 -# define PTR_MANGLE(dst, src, tmp) \
31 - ldq tmp, __pointer_chk_guard; \
33 -# define PTR_MANGLE2(dst, src, tmp) \
35 -# define PTR_DEMANGLE(dst, tmp) PTR_MANGLE(dst, dst, tmp)
36 -# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
38 -extern uintptr_t __pointer_chk_guard attribute_relro;
39 -# define PTR_MANGLE(var) \
40 - (var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
41 -# define PTR_DEMANGLE(var) PTR_MANGLE(var)
45 #endif /* ASSEMBLER */
46 --- glibc-2.6.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h
47 +++ glibc-2.6/sysdeps/unix/sysv/linux/alpha/sysdep.h
49 /* There is some commonality. */
50 #include <sysdeps/unix/alpha/sysdep.h>
54 /* For Linux we can use the system call table in the header file
55 /usr/include/asm/unistd.h
56 of the kernel. But these symbols do not follow the SYS_* syntax
58 INTERNAL_SYSCALL1(name, err_out, nr, args); \
61 +/* Pointer mangling support. Note that tls access is slow enough that
62 + we don't deoptimize things by placing the pointer check value there. */
64 +#if defined NOT_IN_libc && defined IS_IN_rtld
65 +# ifdef __ASSEMBLER__
66 +# define PTR_MANGLE(dst, src, tmp) \
67 + ldah tmp, __pointer_chk_guard_local($29) !gprelhigh; \
68 + ldq tmp, __pointer_chk_guard_local(tmp) !gprellow; \
70 +# define PTR_MANGLE2(dst, src, tmp) \
72 +# define PTR_DEMANGLE(dst, tmp) PTR_MANGLE(dst, dst, tmp)
73 +# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
75 +extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
76 +# define PTR_MANGLE(var) \
77 + (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
78 +# define PTR_DEMANGLE(var) PTR_MANGLE(var)
81 +# ifdef __ASSEMBLER__
82 +# define PTR_MANGLE(dst, src, tmp) \
83 + ldq tmp, __pointer_chk_guard; \
85 +# define PTR_MANGLE2(dst, src, tmp) \
87 +# define PTR_DEMANGLE(dst, tmp) PTR_MANGLE(dst, dst, tmp)
88 +# define PTR_DEMANGLE2(dst, tmp) PTR_MANGLE2(dst, dst, tmp)
90 +extern uintptr_t __pointer_chk_guard attribute_relro;
91 +# define PTR_MANGLE(var) \
92 + (var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
93 +# define PTR_DEMANGLE(var) PTR_MANGLE(var)
96 +/* Pointer mangling is not yet supported for static libc on alpha. */
97 +# ifndef __ASSEMBLER__
98 +# define PTR_MANGLE(var) (void) (var)
99 +# define PTR_DEMANGLE(var) (void) (var)
103 #endif /* _LINUX_ALPHA_SYSDEP_H */