summaryrefslogtreecommitdiffstats
path: root/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/libc/stdlib/malloc.c')
-rw-r--r--lib/libc/stdlib/malloc.c26
1 files changed, 24 insertions, 2 deletions
diff --git a/lib/libc/stdlib/malloc.c b/lib/libc/stdlib/malloc.c
index 5290512..2d932cb 100644
--- a/lib/libc/stdlib/malloc.c
+++ b/lib/libc/stdlib/malloc.c
@@ -219,7 +219,11 @@ __FBSDID("$FreeBSD$");
# define LG_QUANTUM 4
# define LG_SIZEOF_PTR 2
# define CPU_SPINWAIT __asm__ volatile("pause")
-# define TLS_MODEL __attribute__((tls_model("initial-exec")))
+# ifdef __clang__
+# define TLS_MODEL /* clang does not support tls_model yet */
+# else
+# define TLS_MODEL __attribute__((tls_model("initial-exec")))
+# endif
#endif
#ifdef __ia64__
# define LG_QUANTUM 4
@@ -240,7 +244,11 @@ __FBSDID("$FreeBSD$");
# define LG_QUANTUM 4
# define LG_SIZEOF_PTR 3
# define CPU_SPINWAIT __asm__ volatile("pause")
-# define TLS_MODEL __attribute__((tls_model("initial-exec")))
+# ifdef __clang__
+# define TLS_MODEL /* clang does not support tls_model yet */
+# else
+# define TLS_MODEL __attribute__((tls_model("initial-exec")))
+# endif
#endif
#ifdef __arm__
# define LG_QUANTUM 3
@@ -6035,6 +6043,20 @@ RETURN:
}
void *
+aligned_alloc(size_t alignment, size_t size)
+{
+ void *memptr;
+ int ret;
+
+ ret = posix_memalign(&memptr, alignment, size);
+ if (ret != 0) {
+ errno = ret;
+ return (NULL);
+ }
+ return (memptr);
+}
+
+void *
calloc(size_t num, size_t size)
{
void *ret;
OpenPOWER on IntegriCloud