From 82967e527b3ac5074853c0d9014f15a69068a0ec Mon Sep 17 00:00:00 2001 From: jjohnstn Date: Tue, 21 Aug 2001 20:23:15 +0000 Subject: [PATCH] 2001-08-21 Jeff Johnston * libc/stdlib/mallocr.c [!defined(MALLOC_ALIGNMENT)]: Add conditional for SIZE_SZ so that alignment ends up a minimum of 8. --- newlib/ChangeLog | 5 +++++ newlib/libc/stdlib/mallocr.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 51a02854c6..d4e94e4957 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2001-08-21 Jeff Johnston + + * libc/stdlib/mallocr.c [!defined(MALLOC_ALIGNMENT)]: Add conditional + for SIZE_SZ so that alignment ends up a minimum of 8. + Mon Aug 13 22:26:01 2001 Christopher Faylor * libc/include/machine/setjmp.h: Protect sigsetjmp/siglongjmp macro diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c index d269dd390c..fb9b7d8b5f 100644 --- a/newlib/libc/stdlib/mallocr.c +++ b/newlib/libc/stdlib/mallocr.c @@ -1384,7 +1384,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ #define SIZE_SZ (sizeof(INTERNAL_SIZE_T)) #ifndef MALLOC_ALIGNMENT #define MALLOC_ALIGN 8 -#define MALLOC_ALIGNMENT (SIZE_SZ + SIZE_SZ) +#define MALLOC_ALIGNMENT (SIZE_SZ < 4 ? 8 : (SIZE_SZ + SIZE_SZ)) #else #define MALLOC_ALIGN MALLOC_ALIGNMENT #endif -- 2.11.0