diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-02-07 12:10:25 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-02-07 12:10:25 -0200 |
| commit | 43765a182c200e9c43419568b9222e2b8b097050 (patch) | |
| tree | a1ce2884ca7db103551484e206f0df14c48111f4 | |
| parent | 1b248392fbadaa5a81ed220fdf2f7ec3b9939b9e (diff) | |
| download | glibc-43765a182c200e9c43419568b9222e2b8b097050.tar.gz glibc-43765a182c200e9c43419568b9222e2b8b097050.tar.xz glibc-43765a182c200e9c43419568b9222e2b8b097050.zip | |
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | malloc/arena.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 907cc1dd90..d040992f7e 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 921833d277..db7188361c 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; |