From 37a8e8e2fe93b45ab3b39108d9af4b75cf4dd663 Mon Sep 17 00:00:00 2001 From: guenther <> Date: Sun, 13 Sep 2015 08:31:48 +0000 Subject: Wrap so that calls go direct and the symbols not in the C standard are all weak. Apply __{BEGIN,END}_HIDDEN_DECLS to gdtoa{,imp}.h, hiding the arch-specific __strtorx, __ULtox_D2A, __strtorQ, __ULtoQ_D2A symbols. --- src/lib/libc/stdlib/malloc.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib/libc/stdlib/malloc.c') 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 @@ -/* $OpenBSD: malloc.c,v 1.174 2015/04/06 09:18:51 tedu Exp $ */ +/* $OpenBSD: malloc.c,v 1.175 2015/09/13 08:31:47 guenther Exp $ */ /* * Copyright (c) 2008, 2010, 2011 Otto Moerbeek * Copyright (c) 2012 Matthew Dempsky @@ -211,6 +211,7 @@ extern char *__progname; #ifdef MALLOC_STATS void malloc_dump(int); +PROTO_NORMAL(malloc_dump); static void malloc_exit(void); #define CALLER __builtin_return_address(0) #else @@ -1186,6 +1187,7 @@ malloc(size_t size) errno = saved_errno; return r; } +DEF_STRONG(malloc); static void ofree(void *p) @@ -1289,6 +1291,7 @@ free(void *ptr) _MALLOC_UNLOCK(); errno = saved_errno; } +DEF_STRONG(free); static void * @@ -1429,6 +1432,7 @@ realloc(void *ptr, size_t size) errno = saved_errno; return r; } +DEF_STRONG(realloc); /* @@ -1476,6 +1480,7 @@ calloc(size_t nmemb, size_t size) errno = saved_errno; return r; } +DEF_STRONG(calloc); static void * mapalign(struct dir_info *d, size_t alignment, size_t sz, int zero_fill) @@ -1609,6 +1614,7 @@ err: errno = saved_errno; return res; } +DEF_STRONG(posix_memalign); #ifdef MALLOC_STATS @@ -1853,6 +1859,7 @@ malloc_dump(int fd) malloc_dump1(fd, pool); errno = saved_errno; } +DEF_WEAK(malloc_dump); static void malloc_exit(void) -- cgit v1.2.3-55-g6feb