From 33b69e2d76e514b0cce39b1e516fb8ffe2cfd497 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 20 Nov 2016 20:55:35 -0800 Subject: [PATCH] Fix undefined refs on some GNU/Linux hosts Problem reported by Ken Raeburn in: http://lists.gnu.org/archive/html/emacs-devel/2016-11/msg00463.html * src/emacs.c (heap_bss_diff) [CANNOT_DUMP]: Remove, as this is not needed in the CANNOT_UNDUMP case. All uses removed. This removes unwanted references to my_endbss and my_endbss_static, which are not optimized away on some platforms. --- src/emacs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/emacs.c b/src/emacs.c index ac9b649..48df533 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -161,7 +161,7 @@ bool display_arg; Tells GC how to save a copy of the stack. */ char *stack_bottom; -#ifdef GNU_LINUX +#if defined GNU_LINUX && !defined CANNOT_DUMP /* The gap between BSS end and heap start as far as we can tell. */ static uprintmax_t heap_bss_diff; #endif @@ -716,14 +716,14 @@ main (int argc, char **argv) #ifndef CANNOT_DUMP might_dump = !initialized; -#endif -#ifdef GNU_LINUX +# ifdef GNU_LINUX if (!initialized) { char *heap_start = my_heap_start (); heap_bss_diff = heap_start - max (my_endbss, my_endbss_static); } +# endif #endif #if defined WINDOWSNT || defined HAVE_NTGUI @@ -2126,7 +2126,7 @@ You must run Emacs in batch mode in order to dump it. */) if (!might_dump) error ("Emacs can be dumped only once"); -#ifdef GNU_LINUX +#if defined GNU_LINUX && !defined CANNOT_DUMP /* Warn if the gap between BSS end and heap start is larger than this. */ # define MAX_HEAP_BSS_DIFF (1024*1024) -- 2.7.4