aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-10-25 12:13:20 -0700
committerPaul Eggert2016-10-25 12:20:26 -0700
commit32827b374da7b085fc8a45bd35bf57a1afa325f9 (patch)
tree5aed17b53a92a768b5d9b1b4db0d8ccafa83864c
parent96ac0c3ebce825e60595794f99e703ec8302e240 (diff)
downloademacs-32827b374da7b085fc8a45bd35bf57a1afa325f9.tar.gz
emacs-32827b374da7b085fc8a45bd35bf57a1afa325f9.zip
Default REL_ALLOC to 'no'
This should make ralloc-related bugs less likely on GNU/Linux systems with bleeding-edge glibc. See the email thread containing: http://lists.gnu.org/archive/html/emacs-devel/2016-10/msg00801.html Do not merge to master. * configure.ac (REL_ALLOC): Default to 'no' on all platforms, not merely on platforms with Doug Lea malloc. Although bleeding-edge glibc no longer exports __malloc_initialize_hook and so longer passes the configure-time test for Doug Lea malloc, ralloc tickles longstanding bugs like Bug#24358 and Bug#24764 and Emacs is likely to be more reliable without it. This patch is not needed on master, which uses hybrid malloc in this situation.
-rw-r--r--configure.ac10
1 files changed, 1 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index ae7dfe59029..19b44bd34ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2189,18 +2189,10 @@ if test "$doug_lea_malloc" = "yes" ; then
2189 AC_DEFINE(DOUG_LEA_MALLOC, 1, 2189 AC_DEFINE(DOUG_LEA_MALLOC, 1,
2190 [Define to 1 if the system memory allocator is Doug Lea style, 2190 [Define to 1 if the system memory allocator is Doug Lea style,
2191 with malloc hooks and malloc_set_state.]) 2191 with malloc hooks and malloc_set_state.])
2192
2193 ## Use mmap directly for allocating larger buffers.
2194 ## FIXME this comes from src/s/{gnu,gnu-linux}.h:
2195 ## #ifdef DOUG_LEA_MALLOC; #undef REL_ALLOC; #endif
2196 ## Does the AC_FUNC_MMAP test below make this check unnecessary?
2197 case "$opsys" in
2198 mingw32|gnu*) REL_ALLOC=no ;;
2199 esac
2200fi 2192fi
2201 2193
2202if test x"${REL_ALLOC}" = x; then 2194if test x"${REL_ALLOC}" = x; then
2203 REL_ALLOC=${GNU_MALLOC} 2195 REL_ALLOC=no
2204fi 2196fi
2205 2197
2206use_mmap_for_buffers=no 2198use_mmap_for_buffers=no