diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-02-22 18:30:52 +0100 |
| commit | 2f4019de81024cc0d05a5b5cedb1afb28b59a836 (patch) | |
| tree | f837cbd8ac7933828e56baa291384b7b99edeb07 /sysdeps | |
| parent | 541e53c9ddd9ef543cc45b66c7597e63fa665414 (diff) | |
| download | glibc-2f4019de81024cc0d05a5b5cedb1afb28b59a836.tar glibc-2f4019de81024cc0d05a5b5cedb1afb28b59a836.tar.gz glibc-2f4019de81024cc0d05a5b5cedb1afb28b59a836.tar.bz2 glibc-2f4019de81024cc0d05a5b5cedb1afb28b59a836.zip | |
nptl: Move lowlevellock into libc [BZ #15648]
And export __lll_lock_wait and __lll_lock_wait_private as
GLIBC_PRIVATE. This should eliminate the need for the previous
riscv kludge.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/nptl/lowlevellock.h | 6 | ||||
| -rw-r--r-- | sysdeps/riscv/nptl/libc-lowlevellock.c | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index 0a2b413f86..176ba96251 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -75,8 +75,10 @@ #define lll_cond_trylock(lock) \ __glibc_unlikely (atomic_compare_and_exchange_bool_acq (&(lock), 2, 0)) -extern void __lll_lock_wait_private (int *futex) attribute_hidden; -extern void __lll_lock_wait (int *futex, int private) attribute_hidden; +extern void __lll_lock_wait_private (int *futex); +libc_hidden_proto (__lll_lock_wait_private) +extern void __lll_lock_wait (int *futex, int private); +libc_hidden_proto (__lll_lock_wait) /* This is an expression rather than a statement even though its value is void, so that it can be used in a comma expression or as an expression diff --git a/sysdeps/riscv/nptl/libc-lowlevellock.c b/sysdeps/riscv/nptl/libc-lowlevellock.c deleted file mode 100644 index 9523fb46a5..0000000000 --- a/sysdeps/riscv/nptl/libc-lowlevellock.c +++ /dev/null @@ -1,8 +0,0 @@ -/* This kludge works around a libpthread static linking problem: - https://sourceware.org/bugzilla/show_bug.cgi?id=15648. */ - -#ifndef SHARED -# define __lll_lock_wait_private weak_function __lll_lock_wait_private -#endif - -#include <lowlevellock.c> |