lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

ld.so: Remove __libc_memalign

Browse Source 
It is no longer needed since commit 6c444ad6e9
(elf: Do not use memalign for TCB/TLS blocks allocation [BZ #17730]).
Applications do not link against ld.so and will use the definition in
libc.so, so there is no ABI impact.
This commit is contained in:
Florian Weimer
2016-11-30 16:23:58 +01:00
parent 9e78f6f6e7
commit b04beebf07
48 changed files with 106 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
elf/dl-minimal.c
View File

@ -31,8 +31,10 @@
#include <assert.h>
/* Minimal `malloc' allocator for use while loading shared libraries.
No block is ever freed. */
/* Minimal malloc allocator for used during initial link. After the
initial link, a full malloc implementation is interposed, either
the one in libc, or a different one supplied by the user through
interposition. */
static void *alloc_ptr, *alloc_end, *alloc_last_block;
@ -49,7 +51,7 @@ extern unsigned long int weak_function strtoul (const char *nptr,
/* Allocate an aligned memory block. */
void * weak_function
__libc_memalign (size_t align, size_t n)
malloc (size_t n)
{
if (alloc_end == 0)
{
@ -62,8 +64,8 @@ __libc_memalign (size_t align, size_t n)
}
/* Make sure the allocation pointer is ideally aligned. */
alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + align - 1)
& ~(align - 1));
alloc_ptr = (void *) 0 + (((alloc_ptr - (void *) 0) + MALLOC_ALIGNMENT - 1)
& ~(MALLOC_ALIGNMENT - 1));
if (alloc_ptr + n >= alloc_end || n >= -(uintptr_t) alloc_ptr)
{
@ -88,12 +90,6 @@ __libc_memalign (size_t align, size_t n)
return alloc_last_block;
}
void * weak_function
malloc (size_t n)
{
return __libc_memalign (MALLOC_ALIGNMENT, n);
}
/* We use this function occasionally since the real implementation may
be optimized when it can assume the memory it returns already is
set to NUL. */