X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fmalloc%2Faligned_alloc.c;h=cc0a801208712a9f31759690e55e3eabfd7c99f6;hp=c63866295339e3373b0bb8978750aa34a6fb4efe;hb=6d861ac87491a207e4599c44b61d142f0a601c2d;hpb=651416182dc65d75e91cadfec65dd72f9ff07846

diff --git a/src/malloc/aligned_alloc.c b/src/malloc/aligned_alloc.c
index c6386629..cc0a8012 100644
--- a/src/malloc/aligned_alloc.c
+++ b/src/malloc/aligned_alloc.c
@@ -1,52 +1,8 @@
 #include <stdlib.h>
-#include <stdint.h>
-#include <errno.h>
 
-/* This function should work with most dlmalloc-like chunk bookkeeping
- * systems, but it's only guaranteed to work with the native implementation
- * used in this library. */
+void *__memalign(size_t, size_t);
 
 void *aligned_alloc(size_t align, size_t len)
 {
-	unsigned char *mem, *new, *end;
-	size_t header, footer;
-
-	if ((align & -align) != align) {
-		errno = EINVAL;
-		return NULL;
-	}
-
-	if (len > SIZE_MAX - align) {
-		errno = ENOMEM;
-		return NULL;
-	}
-
-	if (align <= 4*sizeof(size_t)) {
-		if (!(mem = malloc(len)))
-			return NULL;
-		return mem;
-	}
-
-	if (!(mem = malloc(len + align-1)))
-		return NULL;
-
-	header = ((size_t *)mem)[-1];
-	new = (void *)((uintptr_t)mem + align-1 & -align);
-
-	if (!(header & 7)) {
-		((size_t *)new)[-2] = ((size_t *)mem)[-2] + (new-mem);
-		((size_t *)new)[-1] = ((size_t *)mem)[-1] - (new-mem);
-		return new;
-	}
-
-	end = mem + (header & -8);
-	footer = ((size_t *)end)[-2];
-
-	((size_t *)mem)[-1] = header&7 | new-mem;
-	((size_t *)new)[-2] = footer&7 | new-mem;
-	((size_t *)new)[-1] = header&7 | end-new;
-	((size_t *)end)[-2] = footer&7 | end-new;
-
-	if (new != mem) free(mem);
-	return new;
+	return __memalign(align, len);
 }