diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2021-07-08 20:48:14 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2021-07-09 06:39:30 -0700 |
commit | dc76a059fded7a203c82dbb91d4fc1f43d3250db (patch) | |
tree | d77c68f593de7ebea9d5202aba84a57554a53355 /malloc/malloc-internal.h | |
parent | 0ec97597c859ac6a69733cf70c6bd6fc809dcc4b (diff) | |
download | glibc-dc76a059fded7a203c82dbb91d4fc1f43d3250db.tar.gz glibc-dc76a059fded7a203c82dbb91d4fc1f43d3250db.tar.xz glibc-dc76a059fded7a203c82dbb91d4fc1f43d3250db.zip |
Add a generic malloc test for MALLOC_ALIGNMENT
1. Add sysdeps/generic/malloc-size.h to define size related macros for malloc. 2. Move x86_64/tst-mallocalign1.c to malloc and replace ALIGN_MASK with MALLOC_ALIGN_MASK. 3. Add tst-mallocalign1 to tests-exclude-mcheck for i386 and x32 since mcheck doesn't honor MALLOC_ALIGNMENT.
Diffstat (limited to 'malloc/malloc-internal.h')
-rw-r--r-- | malloc/malloc-internal.h | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h index 258f29584e..0c7b5a183c 100644 --- a/malloc/malloc-internal.h +++ b/malloc/malloc-internal.h @@ -21,46 +21,7 @@ #include <malloc-machine.h> #include <malloc-sysdep.h> - -/* INTERNAL_SIZE_T is the word-size used for internal bookkeeping of - chunk sizes. - - The default version is the same as size_t. - - While not strictly necessary, it is best to define this as an - unsigned type, even if size_t is a signed type. This may avoid some - artificial size limitations on some systems. - - On a 64-bit machine, you may be able to reduce malloc overhead by - defining INTERNAL_SIZE_T to be a 32 bit `unsigned int' at the - expense of not being able to handle more than 2^32 of malloced - space. If this limitation is acceptable, you are encouraged to set - this unless you are on a platform requiring 16byte alignments. In - this case the alignment requirements turn out to negate any - potential advantages of decreasing size_t word size. - - Implementors: Beware of the possible combinations of: - - INTERNAL_SIZE_T might be signed or unsigned, might be 32 or 64 bits, - and might be the same width as int or as long - - size_t might have different width and signedness as INTERNAL_SIZE_T - - int and long might be 32 or 64 bits, and might be the same width - - To deal with this, most comparisons and difference computations - among INTERNAL_SIZE_Ts should cast them to unsigned long, being - aware of the fact that casting an unsigned int to a wider long does - not sign-extend. (This also makes checking for negative numbers - awkward.) Some of these casts result in harmless compiler warnings - on some systems. */ -#ifndef INTERNAL_SIZE_T -# define INTERNAL_SIZE_T size_t -#endif - -/* The corresponding word size. */ -#define SIZE_SZ (sizeof (INTERNAL_SIZE_T)) - -/* The corresponding bit mask value. */ -#define MALLOC_ALIGN_MASK (MALLOC_ALIGNMENT - 1) - +#include <malloc-size.h> /* Called in the parent process before a fork. */ void __malloc_fork_lock_parent (void) attribute_hidden; |