aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert2016-11-20 16:57:17 -0800
committerPaul Eggert2016-11-20 16:59:24 -0800
commit0b187fd2bfb797e113626df1b3740edbda8b698a (patch)
treebb0d96996a2058c644d829350cafe61263f3c51a /src/emacs.c
parentebe2e69c8fb14dfa169e0497cd868ade79d4c9d8 (diff)
downloademacs-0b187fd2bfb797e113626df1b3740edbda8b698a.tar.gz
emacs-0b187fd2bfb797e113626df1b3740edbda8b698a.zip
Make CANNOT_DUMP work better on GNU/Linux
Clean up some of the bitrot affecting the CANNOT_DUMP code. This lets the build succeed again, and fixes the testing framework so that most test cases now pass. About twenty test cases still fail, though, and we still have Bug#24974. * configure.ac (CANNOT_DUMP): Now empty if CANNOT_DUMP. (SYSTEM_MALLOC): Now true if CANNOT_DUMP. There should no longer be any point to messing with a private memory allocator unless Emacs is dumping. * src/alloc.c (alloc_unexec_pre, alloc_unexec_post, check_pure_size): * src/image.c (reset_image_types): * src/lastfile.c (my_endbss, _my_endbss, my_endbss_static): Do not define if CANNOT_DUMP. * src/emacs.c (might_dump) [CANNOT_DUMP]: Now always false and local. (daemon_pipe) [!WINDOWSNT]: Now static. * test/Makefile.in (mostlyclean): Remove *.tmp files. (make-test-deps.mk): Elide CANNOT_DUMP chatter.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/emacs.c b/src/emacs.c
index efd4fa329df..ac9b6495337 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -130,11 +130,15 @@ Lisp_Object Vlibrary_cache;
130 on subsequent starts. */ 130 on subsequent starts. */
131bool initialized; 131bool initialized;
132 132
133#ifdef CANNOT_DUMP
134enum { might_dump = false };
135#else
133/* Set to true if this instance of Emacs might dump. */ 136/* Set to true if this instance of Emacs might dump. */
134#ifndef DOUG_LEA_MALLOC 137# ifndef DOUG_LEA_MALLOC
135static 138static
136#endif 139# endif
137bool might_dump; 140bool might_dump;
141#endif
138 142
139#ifdef DARWIN_OS 143#ifdef DARWIN_OS
140extern void unexec_init_emacs_zone (void); 144extern void unexec_init_emacs_zone (void);
@@ -196,7 +200,7 @@ int daemon_type;
196#ifndef WINDOWSNT 200#ifndef WINDOWSNT
197/* Pipe used to send exit notification to the background daemon parent at 201/* Pipe used to send exit notification to the background daemon parent at
198 startup. On Windows, we use a kernel event instead. */ 202 startup. On Windows, we use a kernel event instead. */
199int daemon_pipe[2]; 203static int daemon_pipe[2];
200#else 204#else
201HANDLE w32_daemon_event; 205HANDLE w32_daemon_event;
202#endif 206#endif