diff options
| author | Tony Wu <tung7970@gmail.com> | 2014-07-25 13:52:11 +0800 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2014-08-18 12:05:45 +0200 |
| commit | 2d9740a65a81fe050f99479c2a2f38b6a3198a8e (patch) | |
| tree | 8faccc543e0a43dfc15aa0d928a3cf0b43718a2f /libpthread/nptl | |
| parent | 361285886aa319a56c803f2fb783457f3e80f564 (diff) | |
uclibc: nptl: fix __lll_lock_wait_private multiple definition
Mark non-pthread __lll_lock_wait_private weak to avoid multiple
definition error in static link mode.
Signed-off-by: Tony Wu <tung7970@gmail.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread/nptl')
4 files changed, 12 insertions, 0 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c index af864b3d5..cd4213573 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arm/lowlevellock.c @@ -23,6 +23,9 @@ #include <tls.h> void +#ifndef IS_IN_libpthread +weak_function +#endif __lll_lock_wait_private (int *futex) { do diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c index 1aa79609a..2a5bf6dd9 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/lowlevellock.c @@ -26,6 +26,9 @@ void +#ifndef IS_IN_libpthread +weak_function +#endif __lll_lock_wait_private (int *futex) { if (*futex == 2) diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/metag/lowlevellock.c index 8c8955e05..960e02941 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/metag/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/metag/lowlevellock.c @@ -24,6 +24,9 @@ #include <tls.h> void +#ifndef IS_IN_libpthread +weak_function +#endif __lll_lock_wait_private (int *futex) { do diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.c b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.c index 3ff1b736f..35c678eb2 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sparc/lowlevellock.c @@ -25,6 +25,9 @@ void +#ifndef IS_IN_libpthread +weak_function +#endif __lll_lock_wait_private (int *futex) { do |