summaryrefslogtreecommitdiff
path: root/malloc/malloc.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-03-06 06:18:43 +0000
committerRoland McGrath <roland@gnu.org>2006-03-06 06:18:43 +0000
commit7d013a64de1cada889f3db5da793a7b965e87ac1 (patch)
treed8e1a24f918b7053581e67ec29a0a19fdb87c059 /malloc/malloc.c
parent182ed12e71051879279121779ff068825bcd55b5 (diff)
* malloc/malloc.c (MALLOC_ALIGNMENT): Revert to (2 * SIZE_SZ) value.cvs/fedora-glibc-20060306T0720
The correct value differs only on powerpc32, and for now changing it there is causing more trouble than it's worth. * malloc/arena.c: Add compile-time sanity check on padding calculation. 2006-03-05 Jakub Jelinek <jakub@redhat.com> * malloc/arena.c (heap_info): Adjust the padding size if MALLOC_ALIGNMENT > 2 * SIZE_SZ.
Diffstat (limited to 'malloc/malloc.c')
-rw-r--r--malloc/malloc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c
index 99b55c8639..5fbd268fed 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1,5 +1,5 @@
/* Malloc implementation for multiple threads without lock contention.
- Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1996-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Wolfram Gloger <wg@malloc.de>
and Doug Lea <dl@cs.oswego.edu>, 2001.
@@ -381,8 +381,15 @@ extern "C" {
#ifndef MALLOC_ALIGNMENT
+/* XXX This is the correct definition. It differs from 2*SIZE_SZ only on
+ powerpc32. For the time being, changing this is causing more
+ compatibility problems due to malloc_get_state/malloc_set_state than
+ will returning blocks not adequately aligned for long double objects
+ under -mlong-double-128. */
#define MALLOC_ALIGNMENT (2 * SIZE_SZ < __alignof__ (long double) \
? __alignof__ (long double) : 2 * SIZE_SZ)
+*/
+#define MALLOC_ALIGNMENT (2 * SIZE_SZ)
#endif
/* The corresponding bit mask value */