aboutsummaryrefslogtreecommitdiffstats
path: root/src/gmalloc.c
diff options
context:
space:
mode:
authorWolfgang Jenkner2016-01-30 14:20:56 -0800
committerPaul Eggert2016-01-30 15:26:07 -0800
commitd6585a910ed3e9e0e43c093b5fbfeb6d56b703b4 (patch)
tree55f8f2160238a8d2047dbcdf885b4b4c346cb5bb /src/gmalloc.c
parentdec139084586762793448277ebe80cfa7a1790b3 (diff)
downloademacs-d6585a910ed3e9e0e43c093b5fbfeb6d56b703b4.tar.gz
emacs-d6585a910ed3e9e0e43c093b5fbfeb6d56b703b4.zip
Add musl patch to support HYBRID_MALLOC on elf systems
* src/gmalloc.c: Adjust for HYBRID_MALLOC in the non CYGWIN case. (__default_morecore): Here, in particular. * configure.ac: Define HYBRID_MALLOC when unexelf.o is used. New variable SHEAP_OBJ. * src/Makefile.in: Use it. (Bug#22086)
Diffstat (limited to 'src/gmalloc.c')
-rw-r--r--src/gmalloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 72d65af4974..30e01319e0e 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -70,7 +70,7 @@ extern void emacs_abort (void);
70#define aligned_alloc galigned_alloc 70#define aligned_alloc galigned_alloc
71#define free gfree 71#define free gfree
72 72
73#ifdef CYGWIN 73#ifdef HYBRID_MALLOC
74extern void *bss_sbrk (ptrdiff_t size); 74extern void *bss_sbrk (ptrdiff_t size);
75extern int bss_sbrk_did_unexec; 75extern int bss_sbrk_did_unexec;
76extern char bss_sbrk_buffer[]; 76extern char bss_sbrk_buffer[];
@@ -1542,7 +1542,7 @@ void *
1542__default_morecore (ptrdiff_t increment) 1542__default_morecore (ptrdiff_t increment)
1543{ 1543{
1544 void *result; 1544 void *result;
1545#if defined (CYGWIN) 1545#ifdef HYBRID_MALLOC
1546 if (!DUMPED) 1546 if (!DUMPED)
1547 { 1547 {
1548 return bss_sbrk (increment); 1548 return bss_sbrk (increment);