diff options
| -rw-r--r-- | malloc/malloc.c | 14 | ||||
| -rw-r--r-- | sysdeps/generic/malloc-alignment.h | 31 | ||||
| -rw-r--r-- | sysdeps/generic/malloc-machine.h | 1 | ||||
| -rw-r--r-- | sysdeps/i386/malloc-alignment.h | 24 |
4 files changed, 56 insertions, 14 deletions
diff --git a/malloc/malloc.c b/malloc/malloc.c index 1f5f166ea2..e293867d99 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -342,20 +342,6 @@ __malloc_assert (const char *assertion, const char *file, unsigned int line, #define SIZE_SZ (sizeof(INTERNAL_SIZE_T)) -/* - MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. - It must be a power of two at least 2 * SIZE_SZ, even on machines - for which smaller alignments would suffice. It may be defined as - larger than this though. Note however that code and data structures - are optimized for the case of 8-byte alignment. -*/ - - -#ifndef MALLOC_ALIGNMENT -# define MALLOC_ALIGNMENT (2 * SIZE_SZ < __alignof__ (long double) \ - ? __alignof__ (long double) : 2 * SIZE_SZ) -#endif - /* The corresponding bit mask value */ #define MALLOC_ALIGN_MASK (MALLOC_ALIGNMENT - 1) diff --git a/sysdeps/generic/malloc-alignment.h b/sysdeps/generic/malloc-alignment.h new file mode 100644 index 0000000000..efd03faa65 --- /dev/null +++ b/sysdeps/generic/malloc-alignment.h @@ -0,0 +1,31 @@ +/* Define MALLOC_ALIGNMENT for malloc. Generic 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 _GENERIC_MALLOC_ALIGNMENT_H +#define _GENERIC_MALLOC_ALIGNMENT_H + +/* MALLOC_ALIGNMENT is the minimum alignment for malloc'ed chunks. It + must be a power of two at least 2 * SIZE_SZ, even on machines for + which smaller alignments would suffice. It may be defined as larger + than this though. Note however that code and data structures are + optimized for the case of 8-byte alignment. */ +#define MALLOC_ALIGNMENT (2 * SIZE_SZ < __alignof__ (long double) \ + ? __alignof__ (long double) : 2 * SIZE_SZ) + + +#endif /* !defined(_GENERIC_MALLOC_ALIGNMENT_H) */ diff --git a/sysdeps/generic/malloc-machine.h b/sysdeps/generic/malloc-machine.h index 71b95c23e9..930b08873f 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") 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) */ |