diff options
| author | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-01-28 17:34:36 +0000 |
|---|---|---|
| committer | Szabolcs Nagy <szabolcs.nagy@arm.com> | 2021-03-19 11:46:20 +0000 |
| commit | b3c08077cf6d884f45013168cd67e6e5133badf6 (patch) | |
| tree | 84190db75afa587e0509e9f895320d7adbfaddc8 | |
| parent | 9328682723b98811160477628376f7a31a34d2e5 (diff) | |
| download | glibc-b3c08077cf6d884f45013168cd67e6e5133badf6.tar.gz glibc-b3c08077cf6d884f45013168cd67e6e5133badf6.tar.xz glibc-b3c08077cf6d884f45013168cd67e6e5133badf6.zip | |
malloc: Move MTAG_MMAP_FLAGS definition
This is only used internally in malloc.c, the extern declaration was wrong, __mtag_mmap_flags has internal linkage. Reviewed-by: DJ Delorie <dj@redhat.com>
| -rw-r--r-- | include/malloc.h | 7 | ||||
| -rw-r--r-- | malloc/malloc.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/include/malloc.h b/include/malloc.h index 7ae08d53d3..b77761f74d 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -16,11 +16,4 @@ typedef struct malloc_state *mstate; # endif /* !_ISOMAC */ -#ifdef USE_MTAG -extern int __mtag_mmap_flags; -#define MTAG_MMAP_FLAGS __mtag_mmap_flags -#else -#define MTAG_MMAP_FLAGS 0 -#endif - #endif diff --git a/malloc/malloc.c b/malloc/malloc.c index 51cec67e55..61c25d0f93 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -463,11 +463,13 @@ static void *(*__tag_region)(void *, size_t) = __default_tag_region; static void *(*__tag_new_usable)(void *) = __default_tag_nop; static void *(*__tag_at)(void *) = __default_tag_nop; +# define MTAG_MMAP_FLAGS __mtag_mmap_flags # define TAG_NEW_MEMSET(ptr, val, size) __tag_new_memset (ptr, val, size) # define TAG_REGION(ptr, size) __tag_region (ptr, size) # define TAG_NEW_USABLE(ptr) __tag_new_usable (ptr) # define TAG_AT(ptr) __tag_at (ptr) #else +# define MTAG_MMAP_FLAGS 0 # define TAG_NEW_MEMSET(ptr, val, size) memset (ptr, val, size) # define TAG_REGION(ptr, size) (ptr) # define TAG_NEW_USABLE(ptr) (ptr) |