aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'emacs/23.4/27_all_conftest-doug-lea.patch')
-rw-r--r--emacs/23.4/27_all_conftest-doug-lea.patch46
1 files changed, 0 insertions, 46 deletions
diff --git a/emacs/23.4/27_all_conftest-doug-lea.patch b/emacs/23.4/27_all_conftest-doug-lea.patch
deleted file mode 100644
index d4a79b8..0000000
--- a/emacs/23.4/27_all_conftest-doug-lea.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix segmentation fault in emacs during compile phase.
-https://bugs.gentoo.org/602992
-
-Backported from Emacs 24:
-
-commit 4b5b5289577b4cc89ee45595832f943ef9a43de6
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sat Apr 21 23:56:42 2012 -0700
-
- * configure.in (doug_lea_malloc): Check for __malloc_initialize_hook.
-
---- emacs-23.4-orig/configure.in
-+++ emacs-23.4/configure.in
-@@ -1505,17 +1505,21 @@
- # Do the opsystem or machine files prohibit the use of the GNU malloc?
- # Assume not, until told otherwise.
- GNU_MALLOC=yes
--doug_lea_malloc=yes
--AC_CHECK_FUNC(malloc_get_state, ,doug_lea_malloc=no)
--AC_CHECK_FUNC(malloc_set_state, ,doug_lea_malloc=no)
--AC_CACHE_CHECK(whether __after_morecore_hook exists,
-- emacs_cv_var___after_morecore_hook,
--[AC_TRY_LINK([extern void (* __after_morecore_hook)();],[__after_morecore_hook = 0],
-- emacs_cv_var___after_morecore_hook=yes,
-- emacs_cv_var___after_morecore_hook=no)])
--if test $emacs_cv_var___after_morecore_hook = no; then
-- doug_lea_malloc=no
--fi
-+
-+AC_CACHE_CHECK(
-+ [whether malloc is Doug Lea style],
-+ [emacs_cv_var_doug_lea_malloc],
-+ [AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM(
-+ [[#include <malloc.h>
-+ static void hook (void) {}]],
-+ [[malloc_set_state (malloc_get_state ());
-+ __after_morecore_hook = hook;
-+ __malloc_initialize_hook = hook;]])],
-+ [emacs_cv_var_doug_lea_malloc=yes],
-+ [emacs_cv_var_doug_lea_malloc=no])])
-+doug_lea_malloc=$emacs_cv_var_doug_lea_malloc
-+
- if test "${system_malloc}" = "yes"; then
- GNU_MALLOC=no
- GNU_MALLOC_reason="