Commit cdd05651 authored by Paul Eggert's avatar Paul Eggert

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.
parent 0b187fd2
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment