2001-08-21 Jeff Johnston <jjohnstn@redhat.com>

        * libc/stdlib/mallocr.c [!defined(MALLOC_ALIGNMENT)]: Add conditional
        for SIZE_SZ so that alignment ends up a minimum of 8.

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 51a0285..d4e94e4 100644 (file)
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-21  Jeff Johnston  <jjohnstn@redhat.com>
+
+       * 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 <cgf@cygnus.com>
 
        * libc/include/machine/setjmp.h: Protect sigsetjmp/siglongjmp macro

diff --git a/newlib/libc/stdlib/mallocr.c b/newlib/libc/stdlib/mallocr.c
index d269dd3..fb9b7d8 100644 (file)
--- 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