diff options
| author | Lukas Larsson <[email protected]> | 2013-11-01 10:40:29 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-11-01 10:40:29 +0100 |
| commit | f7659aeadf2b50acc6140c62a1d1587bf0a8795c (patch) | |
| tree | dd5e240b61781a95536f48bc59018ba4af7c023e /xcomp | |
| parent | 492b8682fdb46f93c0da16e44051787fc064f530 (diff) | |
| parent | 70ebf76f1cef4a6de6be3ea96b36fb81fe245921 (diff) | |
| download | otp-f7659aeadf2b50acc6140c62a1d1587bf0a8795c.tar.gz otp-f7659aeadf2b50acc6140c62a1d1587bf0a8795c.tar.bz2 otp-f7659aeadf2b50acc6140c62a1d1587bf0a8795c.zip | |
Merge branch 'lukas/erts/openbsd-posix-memalign-fix/OTP-11371' into maint
* lukas/erts/openbsd-posix-memalign-fix/OTP-11371:
erts: Add max alignment posix_memalign configure check
Diffstat (limited to 'xcomp')
| -rw-r--r-- | xcomp/erl-xcomp-vars.sh | 2 | ||||
| -rw-r--r-- | xcomp/erl-xcomp.conf.template | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/xcomp/erl-xcomp-vars.sh b/xcomp/erl-xcomp-vars.sh index eccdff47e3..337e0fb809 100644 --- a/xcomp/erl-xcomp-vars.sh +++ b/xcomp/erl-xcomp-vars.sh @@ -26,4 +26,4 @@ # and precious variables in $ERL_TOP/erts/aclocal.m4. # -erl_xcomp_vars="erl_xcomp_sysroot erl_xcomp_isysroot erl_xcomp_bigendian erl_xcomp_double_middle_endian erl_xcomp_linux_clock_gettime_correction erl_xcomp_linux_nptl erl_xcomp_linux_usable_sigusrx erl_xcomp_linux_usable_sigaltstack erl_xcomp_poll erl_xcomp_kqueue erl_xcomp_putenv_copy erl_xcomp_reliable_fpe erl_xcomp_getaddrinfo erl_xcomp_gethrvtime_procfs_ioctl erl_xcomp_clock_gettime_cpu_time erl_xcomp_after_morecore_hook erl_xcomp_dlsym_brk_wrappers" +erl_xcomp_vars="erl_xcomp_sysroot erl_xcomp_isysroot erl_xcomp_bigendian erl_xcomp_double_middle_endian erl_xcomp_linux_clock_gettime_correction erl_xcomp_linux_nptl erl_xcomp_linux_usable_sigusrx erl_xcomp_linux_usable_sigaltstack erl_xcomp_poll erl_xcomp_kqueue erl_xcomp_putenv_copy erl_xcomp_reliable_fpe erl_xcomp_getaddrinfo erl_xcomp_gethrvtime_procfs_ioctl erl_xcomp_clock_gettime_cpu_time erl_xcomp_after_morecore_hook erl_xcomp_dlsym_brk_wrappers erl_xcomp_posix_memalign" diff --git a/xcomp/erl-xcomp.conf.template b/xcomp/erl-xcomp.conf.template index 7d70332cef..ad72b7d66b 100644 --- a/xcomp/erl-xcomp.conf.template +++ b/xcomp/erl-xcomp.conf.template @@ -264,4 +264,10 @@ # system must have reliable floating point exceptions. #erl_xcomp_reliable_fpe= +# * `erl_xcomp_posix_memalign' - `yes|no'. Defaults to `yes' if `posix_memalign' +# system call exists; otherwise `no'. If `yes', the target system must have a +# `posix_memalign' implementation that accepts larger than page size +# alignment. +#erl_xcomp_posix_memalign= + ## ----------------------------------------------------------------------------- |