aboutsummaryrefslogtreecommitdiffstats
path: root/src/image.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/image.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/image.c')
-rw-r--r--src/image.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/image.c b/src/image.c
index d82fedb8dea..5614f39e15b 100644
--- a/src/image.c
+++ b/src/image.c
@@ -9776,6 +9776,8 @@ lookup_image_type (Lisp_Object type)
9776 return NULL; 9776 return NULL;
9777} 9777}
9778 9778
9779#if !defined CANNOT_DUMP && defined HAVE_WINDOW_SYSTEM
9780
9779/* Reset image_types before dumping. 9781/* Reset image_types before dumping.
9780 Called from Fdump_emacs. */ 9782 Called from Fdump_emacs. */
9781 9783
@@ -9789,6 +9791,7 @@ reset_image_types (void)
9789 image_types = next; 9791 image_types = next;
9790 } 9792 }
9791} 9793}
9794#endif
9792 9795
9793void 9796void
9794syms_of_image (void) 9797syms_of_image (void)