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/i386/malloc-alignment.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/i386/malloc-alignment.h')
| -rw-r--r-- | sysdeps/i386/malloc-alignment.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/sysdeps/i386/malloc-alignment.h b/sysdeps/i386/malloc-alignment.h new file mode 100644 index 0000000000..f72f7a8f14 --- /dev/null +++ b/sysdeps/i386/malloc-alignment.h @@ -0,0 +1,24 @@ +/* Define MALLOC_ALIGNMENT for malloc. i386 version. + Copyright (C) 2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifndef _I386_MALLOC_ALIGNMENT_H +#define _I386_MALLOC_ALIGNMENT_H + +#define MALLOC_ALIGNMENT 16 + +#endif /* !defined(_I386_MALLOC_ALIGNMENT_H) */ |