[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a5f8586 02/15: Link temacs with gnulib compiled wit
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master a5f8586 02/15: Link temacs with gnulib compiled with -Demacs |
Date: |
Sat, 30 Jan 2016 23:26:14 +0000 |
branch: master
commit a5f85861293911b3f394464a04f7972b83d47a95
Author: Wolfgang Jenkner <address@hidden>
Commit: Paul Eggert <address@hidden>
Link temacs with gnulib compiled with -Demacs
This is done to support HYBRID_MALLOC, since some static variables
(e.g., last_environ in putenv.c) hold pointers to memory malloced
before dumping (Bug#22086).
* lib/Makefile.am: Add incantation to install libegnu.a.
* src/Makefile.in ($(lib)/libgnu.a): Replace with libegnu.a
(temacs$(EXEEXT)): Use it.
---
lib/Makefile.am | 9 +++++++++
src/Makefile.in | 6 +++---
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cda9681..a1dd6a4 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -17,6 +17,15 @@ include gnulib.mk
libgnu_a_SOURCES += openat-die.c save-cwd.c
endif
+noinst_LIBRARIES += libegnu.a
+
+libegnu_a_SOURCES = $(libgnu_a_SOURCES)
+libegnu_a_LIBADD = $(patsubst %.o,e-%.o,$(libgnu_a_LIBADD))
+EXTRA_libegnu_a_SOURCES = $(EXTRA_libgnu_a_SOURCES)
+libegnu_a_SHORTNAME = e
+
+libegnu_a_CPPFLAGS = $(AM_CPPFLAGS) -Demacs
+
.PHONY: bootstrap-clean
bootstrap-clean: maintainer-clean
diff --git a/src/Makefile.in b/src/Makefile.in
index b38e7d5..6a31542 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -576,7 +576,7 @@ globals.h: gl-stamp; @true
$(ALLOBJS): globals.h
-$(lib)/libgnu.a: $(config_h)
+$(lib)/libegnu.a: $(config_h)
$(MAKE) -C $(lib) all
## We have to create $(etc) here because init_cmdargs tests its
@@ -584,9 +584,9 @@ $(lib)/libgnu.a: $(config_h)
## This goes on to affect various things, and the emacs binary fails
## to start if Vinstallation_directory has the wrong value.
temacs$(EXEEXT): $(LIBXMENU) $(ALLOBJS) \
- $(lib)/libgnu.a $(EMACSRES) ${charsets} ${charscript}
+ $(lib)/libegnu.a $(EMACSRES) ${charsets} ${charscript}
$(AM_V_CCLD)$(CC) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
- -o temacs $(ALLOBJS) $(lib)/libgnu.a $(W32_RES_LINK) $(LIBES)
+ -o temacs $(ALLOBJS) $(lib)/libegnu.a $(W32_RES_LINK) $(LIBES)
$(MKDIR_P) $(etc)
ifneq ($(CANNOT_DUMP),yes)
$(PAXCTL_if_present) -r $@
- [Emacs-diffs] master updated (935b4d0 -> 692e410), Paul Eggert, 2016/01/30
- [Emacs-diffs] master dec1390 03/15: unexelf.c hook to support HYBRID_MALLOC on ELF, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 874c59a 06/15: Report static heap usage on non-Cygwin, too, Paul Eggert, 2016/01/30
- [Emacs-diffs] master a5f8586 02/15: Link temacs with gnulib compiled with -Demacs,
Paul Eggert <=
- [Emacs-diffs] master 384ffef 05/15: Pacify GCC on extern decls, Paul Eggert, 2016/01/30
- [Emacs-diffs] master d6585a9 04/15: Add musl patch to support HYBRID_MALLOC on elf systems, Paul Eggert, 2016/01/30
- [Emacs-diffs] master cb22fce 01/15: Internal linkage for gmalloc etc. if HYBRID_MALLOC, Paul Eggert, 2016/01/30
- [Emacs-diffs] master e4cd4a7 08/15: * src/alloc.c: Include "sheap.h"., Paul Eggert, 2016/01/30
- [Emacs-diffs] master e1a9f20 07/15: Pacify --enable-gcc-warnings when HYBRID_MALLOC, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 2ee2963 12/15: Shrink static heap a bit, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 370a260 14/15: Make it easy to override preferred-branch test, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 3d82a8e 11/15: Fix extern symbols defined and not used, Paul Eggert, 2016/01/30
- [Emacs-diffs] master 7fdc3cf 10/15: Build lib/e-*.o only on platforms that need it, Paul Eggert, 2016/01/30
- [Emacs-diffs] master a4817d8 09/15: Include <malloc.h> when advisable, Paul Eggert, 2016/01/30