From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Tue, 7 Feb 2017 14:10:25 +0000 (-0200)
Subject: malloc: Fix i686 build from malloc interpose backport
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=43765a182c200e9c43419568b9222e2b8b097050;p=thirdparty%2Fglibc.git

malloc: Fix i686 build from malloc interpose backport

This patch fixes i686 build after malloc interpose fix backport
(commit 749c94d4).

Checked on i686-linux-gnu.

	* malloc/arena.c (__malloc_fork_lock_parent): Add internal_function
	attribute.
	(__malloc_fork_unlock_parent): Likewise.
	(__malloc_fork_unlock_child): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 907cc1dd90c..d040992f7ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-07  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* malloc/arena.c (__malloc_fork_lock_parent): Add internal_function
+	attribute.
+	(__malloc_fork_unlock_parent): Likewise.
+	(__malloc_fork_unlock_child): Likewise.
+
 2015-07-29  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #18078]
diff --git a/malloc/arena.c b/malloc/arena.c
index 921833d277b..db7188361c7 100644
--- a/malloc/arena.c
+++ b/malloc/arena.c
@@ -209,6 +209,7 @@ static unsigned int atfork_recursive_cntr;
    subsystem.  */
 
 void
+internal_function
 __malloc_fork_lock_parent (void)
 {
   mstate ar_ptr;
@@ -251,6 +252,7 @@ out:
 }
 
 void
+internal_function
 __malloc_fork_unlock_parent (void)
 {
   mstate ar_ptr;
@@ -278,6 +280,7 @@ __malloc_fork_unlock_parent (void)
 }
 
 void
+internal_function
 __malloc_fork_unlock_child (void)
 {
   mstate ar_ptr;