about summary refs log tree commit diff
path: root/string/tst-strcoll-overflow.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2017-06-30 09:11:08 -0700
committerH.J. Lu <hjl.tools@gmail.com>2017-06-30 09:53:31 -0700
commit646afc29797eed2aca4a42b3518b046e6c935e8b (patch)
tree4bd0c7a80dea3185f5d4d419de8afe84eecf29d5 /string/tst-strcoll-overflow.c
parentdd3a46ce6722d29ea1a19bd8629a98b26d606ab7 (diff)
downloadglibc-hjl/pr21120/2.24.tar.gz
glibc-hjl/pr21120/2.24.tar.xz
glibc-hjl/pr21120/2.24.zip
i386: Increase MALLOC_ALIGNMENT to 16 [BZ #21120] hjl/pr21120/2.24
GCC 7 changed the definition of max_align_t on i386:

https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=9b5c49ef97e63cc63f1ffa13baf771368105ebe2

As a result, glibc malloc no longer returns memory blocks which are as
aligned as max_align_t requires.

This causes malloc/tst-malloc-thread-fail to fail with an error like this
one:

error: allocation function 0, size 144 not aligned to 16

This patch moves the MALLOC_ALIGNMENT definition to <malloc-alignment.h>
and increases the malloc alignment to 16 for i386.

	[BZ #21120]
	* malloc/malloc.c (MALLOC_ALIGNMENT): Moved to ...
	* sysdeps/generic/malloc-alignment.h: Here.  New file.
	* sysdeps/i386/malloc-alignment.h: Likewise.
	* sysdeps/generic/malloc-machine.h: Include <malloc-alignment.h>.

(cherry picked from commit 4e61a6be446026c327aa70cef221c9082bf0085d)
Diffstat (limited to 'string/tst-strcoll-overflow.c')
0 files changed, 0 insertions, 0 deletions