From: Rich Felker <dalias@libc.org>
Date: Sat, 30 Jan 2016 22:20:56 +0000 (-0800)
Subject: unexelf.c hook to support HYBRID_MALLOC on ELF
X-Git-Tag: emacs-26.0.90~2785
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dec139084586762793448277ebe80cfa7a1790b3;p=emacs.git

unexelf.c hook to support HYBRID_MALLOC on ELF

* src/unexelf.c (unexec) [HYBRID_MALLOC]:
Define bss_sbrk_did_unexec (Bug#22086).
Copyright-paperwork-exempt: yes
---

diff --git a/src/unexelf.c b/src/unexelf.c
index e90199472ed..32aa1b281da 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -227,6 +227,11 @@ unexec (const char *new_name, const char *old_name)
   off_t new_file_size;
   void *new_break;
 
+#ifdef HYBRID_MALLOC
+  extern int bss_sbrk_did_unexec;
+  bss_sbrk_did_unexec = 1;
+#endif
+
   /* Pointers to the base of the image of the two files.  */
   caddr_t old_base, new_base;