emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 3d6af11c42: Fix NS unexec build


From: Po Lu
Subject: master 3d6af11c42: Fix NS unexec build
Date: Sat, 30 Jul 2022 22:55:27 -0400 (EDT)

branch: master
commit 3d6af11c42453065d5ace1223fe99228b7927318
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Fix NS unexec build
    
    * nextstep/Makefile.in (all): Only build Emacs.pdmp on pdumper
    builds.
    
    * src/sheap.h: Make STATIC_HEAP_SIZE bigger, otherwise I get:
    static heap exhausted: avail 67108864 used 67101824 failed
    request 20480
---
 nextstep/Makefile.in | 6 +++++-
 src/sheap.h          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in
index 9c7059f2c0..ee883f3cff 100644
--- a/nextstep/Makefile.in
+++ b/nextstep/Makefile.in
@@ -45,7 +45,11 @@ ns_check_file = @ns_appdir@/@ns_check_file@
 
 .PHONY: all
 
-all: ${ns_appdir} ${ns_appbindir}/Emacs ${ns_applibexecdir}/Emacs.pdmp
+ifeq ($(DUMPING),pdumper)
+ns_pdump_target = ${ns_applibexecdir}/Emacs.pdmp
+endif
+
+all: ${ns_appdir} ${ns_appbindir}/Emacs ${ns_pdmp_target}
 
 ${ns_check_file}: ${ns_appdir}
 
diff --git a/src/sheap.h b/src/sheap.h
index 9133f0b292..cef111bc2f 100644
--- a/src/sheap.h
+++ b/src/sheap.h
@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see 
<https://www.gnu.org/licenses/>.  */
 /* Size of the static heap.  Guess a value that is probably too large,
    by up to a factor of four or so.  Typically the unused part is not
    paged in and so does not cost much.  */
-enum { STATIC_HEAP_SIZE = sizeof (Lisp_Object) << 23 };
+enum { STATIC_HEAP_SIZE = sizeof (Lisp_Object) << 24 };
 
 extern char bss_sbrk_buffer[STATIC_HEAP_SIZE];
 extern char *max_bss_sbrk_ptr;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]