diff options
| author | Wolfgang Jenkner <wjenkner@inode.at> | 2016-01-30 14:20:56 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-01-30 15:26:07 -0800 |
| commit | d6585a910ed3e9e0e43c093b5fbfeb6d56b703b4 (patch) | |
| tree | 55f8f2160238a8d2047dbcdf885b4b4c346cb5bb /src/gmalloc.c | |
| parent | dec139084586762793448277ebe80cfa7a1790b3 (diff) | |
| download | emacs-d6585a910ed3e9e0e43c093b5fbfeb6d56b703b4.tar.gz | |
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.c | 4 |
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); #define aligned_alloc galigned_alloc #define free gfree -#ifdef CYGWIN +#ifdef HYBRID_MALLOC extern void *bss_sbrk (ptrdiff_t size); extern int bss_sbrk_did_unexec; extern char bss_sbrk_buffer[]; @@ -1542,7 +1542,7 @@ void * __default_morecore (ptrdiff_t increment) { void *result; -#if defined (CYGWIN) +#ifdef HYBRID_MALLOC if (!DUMPED) { return bss_sbrk (increment); |