merge fix from blackfin cvs:

bernds writes: Use __alignof__ instead of sizeof to get alignments.  Eliminates some warnings about misalignments when malloc debugging is enabled.

diff --git a/libc/stdlib/malloc/heap.h b/libc/stdlib/malloc/heap.h
index ab1a738..b66b5ec 100644 (file)
--- a/libc/stdlib/malloc/heap.h
+++ b/libc/stdlib/malloc/heap.h
@@ -25,7 +25,7 @@
    HEAP_GRANULARITY must be a power of 2.  Malloc depends on this being the
    same as MALLOC_ALIGNMENT.  */
 #define HEAP_GRANULARITY_TYPE  double
-#define HEAP_GRANULARITY       (sizeof (HEAP_GRANULARITY_TYPE))
+#define HEAP_GRANULARITY       (__alignof__ (HEAP_GRANULARITY_TYPE))
 
 
 /* A heap is a collection of memory blocks, from which smaller blocks

diff --git a/libc/stdlib/malloc/malloc.h b/libc/stdlib/malloc/malloc.h
index e722bc8..b41c4b0 100644 (file)
--- a/libc/stdlib/malloc/malloc.h
+++ b/libc/stdlib/malloc/malloc.h
@@ -12,7 +12,7 @@
  */
 
 /* The alignment we guarantee for malloc return values.  */
-#define MALLOC_ALIGNMENT       (sizeof (double))
+#define MALLOC_ALIGNMENT       (__alignof__ (double))
 
 /* The system pagesize... */
 extern size_t __pagesize;