Commit 978cf88b authored by Paul Eggert's avatar Paul Eggert

Port pdumper to older GNU/Linux

Problem reported by Colin Baxter in:
https://lists.gnu.org/r/emacs-devel/2019-01/msg00321.html
* src/alloc.c (my_heap_start): Also define if
GNU_LINUX && CANNOT_DUMP && DOUG_LEA_MALLOC.
parent 191a5568
Pipeline #548 failed with stage
in 51 minutes and 5 seconds
......@@ -103,24 +103,12 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */
#include "w32heap.h" /* for sbrk */
#endif
#if defined GNU_LINUX && !defined CANNOT_DUMP
/* The address where the heap starts. */
void *
my_heap_start (void)
{
static void *start;
if (! start)
start = sbrk (0);
return start;
}
#endif
#ifdef DOUG_LEA_MALLOC
/* Specify maximum number of areas to mmap. It would be nice to use a
value that explicitly means "no limit". */
#define MMAP_MAX_AREAS 100000000
# define MMAP_MAX_AREAS 100000000
/* A pointer to the memory allocated that copies that static data
inside glibc's malloc. */
......@@ -136,9 +124,9 @@ malloc_initialize_hook (void)
if (! initialized)
{
#ifdef GNU_LINUX
# ifdef GNU_LINUX
my_heap_start ();
#endif
# endif
malloc_using_checking = getenv ("MALLOC_CHECK_") != NULL;
}
else
......@@ -201,6 +189,20 @@ alloc_unexec_post (void)
free (malloc_state_ptr);
# endif
}
# ifdef GNU_LINUX
/* The address where the heap starts. */
void *
my_heap_start (void)
{
static void *start;
if (! start)
start = sbrk (0);
return start;
}
# endif
#endif
/* Mark, unmark, query mark bit of a Lisp string. S must be a pointer
......
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