From 888d9a0146b4b8364e065ab359eae5b3db5badb9 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 14 Apr 2016 12:53:03 +0200 Subject: malloc: Add missing internal_function attributes on function definitions Fixes build on i386 after commit 29d794863cd6e03115d3670707cc873a9965ba92. (cherry picked from commit 186fe877f3df0b84d57dfbf0386f6332c6aa69bc) --- ChangeLog | 6 ++++++ malloc/arena.c | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index c36fca4..85a0733 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-04-14 Florian Weimer + * malloc/arena.c (__malloc_fork_lock_parent) + (__malloc_fork_unlock_parent, __malloc_fork_unlock_child): Add + internal_function attribute. + +2016-04-14 Florian Weimer + Remove malloc hooks from fork handler. They are no longer needed because malloc runs right before fork, and no malloc calls from other fork handlers are not possible anymore. diff --git a/malloc/arena.c b/malloc/arena.c index 1c70b35..47715b6 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -139,6 +139,7 @@ int __malloc_initialized = -1; subsystem. */ void +internal_function __malloc_fork_lock_parent (void) { if (__malloc_initialized < 1) @@ -159,6 +160,7 @@ __malloc_fork_lock_parent (void) } void +internal_function __malloc_fork_unlock_parent (void) { if (__malloc_initialized < 1) @@ -175,6 +177,7 @@ __malloc_fork_unlock_parent (void) } void +internal_function __malloc_fork_unlock_child (void) { if (__malloc_initialized < 1) -- cgit v1.1