diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 14:20:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 15:26:08 -0800 |
| commit | 7fdc3cf046ee112b883752ea15ca8cb05444d12f (patch) | |
| tree | 3656fb91c2100d280d0a70d3b81ead2a63ed317e /configure.ac | |
| parent | a4817d834e7d125d31049dfb6fd0a0df4782bad0 (diff) | |
| download | emacs-7fdc3cf046ee112b883752ea15ca8cb05444d12f.tar.gz | |
Build lib/e-*.o only on platforms that need it
* configure.ac (hybrid malloc): Simplify configuration.
(SHEAP_OBJ): Remove; no longer needed.
(HYBRID_MALLOC): New var. Subst it.
(HYBRID_MALLOC_LIB): New Automake conditional.
* lib/Makefile.am (noinst_LIBRARIES): Add libegnu.a only if
HYBRID_MALLOC_LIB.
(libegnu_a_CPPFLAGS): Omit AM_CPPFLAGS; not needed.
(MOSTLYCLEANFILES): Add libegnu.a.
* src/Makefile.in (SHEAP_OBJ): Remove.
(HYBRID_MALLOC): New macro.
(base_obj): Use it to conditionally add sheap.o.
(LIBEGNU_ARCHIVE): New macro.
($(LIBEGNU_ARCHIVE)): New rule, replacing $(lib)/libegnu.a.
All uses of the latter replaced by the former.
* src/alloc.c (USE_ALIGNED_ALLOC): Simplify configuration.
Correct misspelling ALIGNED_ALLOC to HAVE_ALIGNED_ALLOC.
* src/gmalloc.c: Update comment.
* src/lisp.h (aligned_alloc)
[!DOUG_LEA_MALLOC && !HYBRID_MALLOC && !SYSTEM_MALLOC]:
New decl.
(Bug#22086)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ef6ddc66d4d..856c36c7061 100644 --- a/configure.ac +++ b/configure.ac @@ -2123,12 +2123,12 @@ case "$opsys" in esac if test "${system_malloc}" != yes && test "${doug_lea_malloc}" != yes \ - && test "${UNEXEC_OBJ}" = unexelf.o && test "${hybrid_malloc}" != no; then + && test "${UNEXEC_OBJ}" = unexelf.o; then hybrid_malloc=yes fi GMALLOC_OBJ= -SHEAP_OBJ= +HYBRID_MALLOC= if test "${system_malloc}" = "yes"; then AC_DEFINE([SYSTEM_MALLOC], 1, [Define to 1 to use the system memory allocator, even if it is not @@ -2140,10 +2140,10 @@ if test "${system_malloc}" = "yes"; then elif test "$hybrid_malloc" = yes; then AC_DEFINE(HYBRID_MALLOC, 1, [Define to use gmalloc before dumping and the system malloc after.]) + HYBRID_MALLOC=1 GNU_MALLOC= GNU_MALLOC_reason="only before dumping" GMALLOC_OBJ=gmalloc.o - SHEAP_OBJ=sheap.o VMLIMIT_OBJ= else test "$doug_lea_malloc" != "yes" && GMALLOC_OBJ=gmalloc.o @@ -2163,8 +2163,9 @@ else of the main data segment.]) fi fi +AC_SUBST([HYBRID_MALLOC]) +AM_CONDITIONAL([HYBRID_MALLOC_LIB], [test -n "$HYBRID_MALLOC"]) AC_SUBST(GMALLOC_OBJ) -AC_SUBST(SHEAP_OBJ) AC_SUBST(VMLIMIT_OBJ) if test "$doug_lea_malloc" = "yes" && test "$hybrid_malloc" != yes; then |