aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-11-20 20:55:35 -0800
committerPaul Eggert2016-11-20 20:55:57 -0800
commitcdd056519da9ef058e28b5f198357af52228e9b6 (patch)
tree18d8c0e03b638f049dec6f35b87628818b9e9942 /src
parent0b187fd2bfb797e113626df1b3740edbda8b698a (diff)
downloademacs-cdd056519da9ef058e28b5f198357af52228e9b6.tar.gz
emacs-cdd056519da9ef058e28b5f198357af52228e9b6.zip
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.
Diffstat (limited to 'src')
-rw-r--r--src/emacs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/emacs.c b/src/emacs.c
index ac9b6495337..48df53390b3 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -161,7 +161,7 @@ bool display_arg;
161 Tells GC how to save a copy of the stack. */ 161 Tells GC how to save a copy of the stack. */
162char *stack_bottom; 162char *stack_bottom;
163 163
164#ifdef GNU_LINUX 164#if defined GNU_LINUX && !defined CANNOT_DUMP
165/* The gap between BSS end and heap start as far as we can tell. */ 165/* The gap between BSS end and heap start as far as we can tell. */
166static uprintmax_t heap_bss_diff; 166static uprintmax_t heap_bss_diff;
167#endif 167#endif
@@ -716,14 +716,14 @@ main (int argc, char **argv)
716 716
717#ifndef CANNOT_DUMP 717#ifndef CANNOT_DUMP
718 might_dump = !initialized; 718 might_dump = !initialized;
719#endif
720 719
721#ifdef GNU_LINUX 720# ifdef GNU_LINUX
722 if (!initialized) 721 if (!initialized)
723 { 722 {
724 char *heap_start = my_heap_start (); 723 char *heap_start = my_heap_start ();
725 heap_bss_diff = heap_start - max (my_endbss, my_endbss_static); 724 heap_bss_diff = heap_start - max (my_endbss, my_endbss_static);
726 } 725 }
726# endif
727#endif 727#endif
728 728
729#if defined WINDOWSNT || defined HAVE_NTGUI 729#if defined WINDOWSNT || defined HAVE_NTGUI
@@ -2126,7 +2126,7 @@ You must run Emacs in batch mode in order to dump it. */)
2126 if (!might_dump) 2126 if (!might_dump)
2127 error ("Emacs can be dumped only once"); 2127 error ("Emacs can be dumped only once");
2128 2128
2129#ifdef GNU_LINUX 2129#if defined GNU_LINUX && !defined CANNOT_DUMP
2130 2130
2131 /* Warn if the gap between BSS end and heap start is larger than this. */ 2131 /* Warn if the gap between BSS end and heap start is larger than this. */
2132# define MAX_HEAP_BSS_DIFF (1024*1024) 2132# define MAX_HEAP_BSS_DIFF (1024*1024)