diff options
| author | Florian Weimer <fweimer@redhat.com> | 2017-04-18 11:50:58 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2017-04-18 11:50:58 +0200 |
| commit | 025b33ae84bb8f15b2748a1d8605dca453fce112 (patch) | |
| tree | 2bb47e51512665a67018d8ed07e99b6401544a89 /malloc | |
| parent | 6c6ab1fc49d524ab1892cb20ee74352ace0b8034 (diff) | |
malloc: Turn cfree into a compatibility symbol
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/Versions | 2 | ||||
| -rw-r--r-- | malloc/malloc.c | 5 | ||||
| -rw-r--r-- | malloc/malloc.h | 3 |
3 files changed, 5 insertions, 5 deletions
diff --git a/malloc/Versions b/malloc/Versions index f3c3d8a093..e34ab177be 100644 --- a/malloc/Versions +++ b/malloc/Versions @@ -61,6 +61,8 @@ libc { GLIBC_2.16 { aligned_alloc; } + GLIBC_2.26 { + } GLIBC_PRIVATE { # Internal startup hook for libpthread. __libc_malloc_pthread_startup; diff --git a/malloc/malloc.c b/malloc/malloc.c index 4c40e2ea19..068ffc1684 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -84,7 +84,6 @@ independent_calloc(size_t n_elements, size_t size, void* chunks[]); independent_comalloc(size_t n_elements, size_t sizes[], void* chunks[]); pvalloc(size_t n); - cfree(void* p); malloc_trim(size_t pad); malloc_usable_size(void* p); malloc_stats(); @@ -5290,7 +5289,6 @@ weak_alias (__malloc_info, malloc_info) strong_alias (__libc_calloc, __calloc) weak_alias (__libc_calloc, calloc) -strong_alias (__libc_free, __cfree) weak_alias (__libc_free, cfree) strong_alias (__libc_free, __free) strong_alias (__libc_free, free) strong_alias (__libc_malloc, __malloc) strong_alias (__libc_malloc, malloc) strong_alias (__libc_memalign, __memalign) @@ -5306,6 +5304,9 @@ weak_alias (__malloc_stats, malloc_stats) weak_alias (__malloc_usable_size, malloc_usable_size) weak_alias (__malloc_trim, malloc_trim) +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_26) +compat_symbol (libc, __libc_free, cfree, GLIBC_2_0); +#endif /* ------------------------------------------------------------ History: diff --git a/malloc/malloc.h b/malloc/malloc.h index 0bd8f97bc3..274c0958e4 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -52,9 +52,6 @@ __THROW __attribute_warn_unused_result__; /* Free a block allocated by `malloc', `realloc' or `calloc'. */ extern void free (void *__ptr) __THROW; -/* Free a block allocated by `calloc'. */ -extern void cfree (void *__ptr) __THROW; - /* Allocate SIZE bytes allocated to ALIGNMENT bytes. */ extern void *memalign (size_t __alignment, size_t __size) __THROW __attribute_malloc__ __wur; |