diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-06-30 09:11:08 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-06-30 09:11:24 -0700 |
| commit | 4e61a6be446026c327aa70cef221c9082bf0085d (patch) | |
| tree | 978976a09fbc325324d8b5c9caffae789165ce03 /sysdeps/generic/malloc-machine.h | |
| parent | a9270e673dcc1ef1d2c2d96fa09d468c59883d88 (diff) | |
| download | glibc-4e61a6be446026c327aa70cef221c9082bf0085d.tar.gz | |
i386: Increase MALLOC_ALIGNMENT to 16 [BZ #21120]
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-internal.h (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>.
Diffstat (limited to 'sysdeps/generic/malloc-machine.h')
| -rw-r--r-- | sysdeps/generic/malloc-machine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h index 21aa9fcdce..4491b90fc8 100644 --- a/sysdeps/generic/malloc-machine.h +++ b/sysdeps/generic/malloc-machine.h @@ -21,6 +21,7 @@ #define _GENERIC_MALLOC_MACHINE_H #include <atomic.h> +#include <malloc-alignment.h> #ifndef atomic_full_barrier # define atomic_full_barrier() __asm ("" ::: "memory") |