summaryrefslogtreecommitdiff
path: root/src/lib/libc/stdlib/malloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libc/stdlib/malloc.c')
-rw-r--r--src/lib/libc/stdlib/malloc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 5e5dafbd17..0967fe3a08 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.174 2015/04/06 09:18:51 tedu Exp $ */ 1/* $OpenBSD: malloc.c,v 1.175 2015/09/13 08:31:47 guenther Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -211,6 +211,7 @@ extern char *__progname;
211 211
212#ifdef MALLOC_STATS 212#ifdef MALLOC_STATS
213void malloc_dump(int); 213void malloc_dump(int);
214PROTO_NORMAL(malloc_dump);
214static void malloc_exit(void); 215static void malloc_exit(void);
215#define CALLER __builtin_return_address(0) 216#define CALLER __builtin_return_address(0)
216#else 217#else
@@ -1186,6 +1187,7 @@ malloc(size_t size)
1186 errno = saved_errno; 1187 errno = saved_errno;
1187 return r; 1188 return r;
1188} 1189}
1190DEF_STRONG(malloc);
1189 1191
1190static void 1192static void
1191ofree(void *p) 1193ofree(void *p)
@@ -1289,6 +1291,7 @@ free(void *ptr)
1289 _MALLOC_UNLOCK(); 1291 _MALLOC_UNLOCK();
1290 errno = saved_errno; 1292 errno = saved_errno;
1291} 1293}
1294DEF_STRONG(free);
1292 1295
1293 1296
1294static void * 1297static void *
@@ -1429,6 +1432,7 @@ realloc(void *ptr, size_t size)
1429 errno = saved_errno; 1432 errno = saved_errno;
1430 return r; 1433 return r;
1431} 1434}
1435DEF_STRONG(realloc);
1432 1436
1433 1437
1434/* 1438/*
@@ -1476,6 +1480,7 @@ calloc(size_t nmemb, size_t size)
1476 errno = saved_errno; 1480 errno = saved_errno;
1477 return r; 1481 return r;
1478} 1482}
1483DEF_STRONG(calloc);
1479 1484
1480static void * 1485static void *
1481mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) 1486mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill)
@@ -1609,6 +1614,7 @@ err:
1609 errno = saved_errno; 1614 errno = saved_errno;
1610 return res; 1615 return res;
1611} 1616}
1617DEF_STRONG(posix_memalign);
1612 1618
1613#ifdef MALLOC_STATS 1619#ifdef MALLOC_STATS
1614 1620
@@ -1853,6 +1859,7 @@ malloc_dump(int fd)
1853 malloc_dump1(fd, pool); 1859 malloc_dump1(fd, pool);
1854 errno = saved_errno; 1860 errno = saved_errno;
1855} 1861}
1862DEF_WEAK(malloc_dump);
1856 1863
1857static void 1864static void
1858malloc_exit(void) 1865malloc_exit(void)