GNU C Library master sources branch, master, updated. glibc-2.15-979-gcbc00a0

[roland at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  cbc00a03986c5890f0a9d2c7cdac26b7606fe98c (commit)
      from  478143fa1706a0212366dfa4d9bcf3d8334ca131 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=cbc00a03986c5890f0a9d2c7cdac26b7606fe98c

commit cbc00a03986c5890f0a9d2c7cdac26b7606fe98c
Author: Roland McGrath <roland@hack.frob.com>
Date:   Mon May 21 11:13:10 2012 -0700

    Set MALLOC_ALIGNMENT to at least __alignof__ (long double) for new ABIs.

diff --git a/ChangeLog b/ChangeLog
index 8b4c591..2e2beed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21  Roland McGrath  <roland@hack.frob.com>
+
+	* malloc/malloc.c [!SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_16)]
+	(MALLOC_ALIGNMENT): Set it to the greater of 2 * SIZE_SZ and
+	__alignof__ (long double).
+
 2012-05-21  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/fpu/libm-test-ulps: Update.
@@ -22,7 +28,8 @@
 	* sysdeps/sparc/sysdep.h: ... here.  Include it.
 	* sysdeps/unix/sysv/linux/s390/bits/hwcap.h: New file.
 	* sysdeps/unix/sysv/linux/i386/nptl/libc.abilist: Update.
-	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist: Update.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libc.abilist:
+	Update.
 	* sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libc.abilist: Update.
 	* sysdeps/unix/sysv/linux/s390/s390-32/nptl/libc.abilist: Update.
 	* sysdeps/unix/sysv/linux/s390/s390-64/nptl/libc.abilist: Update.
diff --git a/malloc/malloc.c b/malloc/malloc.c
index abe3872..c216d26 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -337,16 +337,20 @@ __malloc_assert (const char *assertion, const char *file, unsigned int line,
 
 
 #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)
+# if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_16)
+/* This is the correct definition when there is no past ABI to constrain it.
+
+   Among configurations with a past ABI constraint, 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 and
+   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)
+# else
+#  define MALLOC_ALIGNMENT       (2 * SIZE_SZ)
+# endif
 #endif
 
 /* The corresponding bit mask value */

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog       |    9 ++++++++-
 malloc/malloc.c |   24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources