diff options
| author | Jeff Johnston <jjohnstn@redhat.com> | 2006-12-18 23:21:48 +0300 |
|---|---|---|
| committer | Jeff Johnston <jjohnstn@redhat.com> | 2006-12-18 23:21:48 +0300 |
| commit | f5222560755e78d150a79094469210c7cd8230d8 (patch) | |
| tree | a5d5561da41b7fdb6c6ce0f68071cdd187b2a6ab /newlib | |
| parent | 9b354d7f3b28ee13105b256a475e28533c53dea8 (diff) | |
2006-12-18 Jeff Johnston <jjohnstn@redhat.com>
* libc/stdlib/mallocr.c (malloc_extend_top): Add patch from
2.6.5 version of Doug Lea's malloc which is the basis of
this code.
Diffstat (limited to 'newlib')
| -rw-r--r-- | newlib/ChangeLog | 11 | ||||
| -rw-r--r-- | newlib/libc/stdlib/mallocr.c | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index f33be08e7..58d896cfa 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,14 @@ +2006-12-18 Jeff Johnston <jjohnstn@redhat.com> + + * libc/stdlib/mallocr.c (malloc_extend_top): Add patch from + 2.6.5 version of Doug Lea's malloc which is the basis of + this code. + +2006-12-18 Jeff Johnston <jjohnstn@redhat.com> + + * aclocal.m4 */aclocal.m4: Regenerated using aclocal 1.9.6. + * Makefile.in */Makefile.in: Regenerated using automake 1.9.6. + 2006-12-18 Kazunori Asayama <asayama@sm.sony.co.jp> * libc/include/machine/setjmp.h[__SPU__]: Replace vector with __vector. diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c index cfa25545f..e7cdace22 100644 --- a/newlib/libc/stdlib/mallocr.c +++ b/newlib/libc/stdlib/mallocr.c @@ -2223,11 +2223,11 @@ static void malloc_extend_top(RARG nb) RDECL INTERNAL_SIZE_T nb; /* Also keep size a multiple of MALLOC_ALIGNMENT */ old_top_size = (old_top_size - 3*SIZE_SZ) & ~MALLOC_ALIGN_MASK; - set_head_size(old_top, old_top_size); chunk_at_offset(old_top, old_top_size )->size = SIZE_SZ|PREV_INUSE; chunk_at_offset(old_top, old_top_size + SIZE_SZ)->size = SIZE_SZ|PREV_INUSE; + set_head_size(old_top, old_top_size); /* If possible, release the rest. */ if (old_top_size >= MINSIZE) fREe(RCALL chunk2mem(old_top)); |