Date: Fri, 23 Apr 2021 11:14:49 GMT From: Konstantin Belousov <kib@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 520806c476b9 - stable/13 - rtld_lock.h: Expand scope for IN_RTLD to avoid some conflicts with libc Message-ID: <202104231114.13NBEnP9012869@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=520806c476b9f628c2e8bfbc4c3835aeeec26c2e commit 520806c476b9f628c2e8bfbc4c3835aeeec26c2e Author: Konstantin Belousov <kib@FreeBSD.org> AuthorDate: 2021-04-05 04:12:22 +0000 Commit: Konstantin Belousov <kib@FreeBSD.org> CommitDate: 2021-04-23 11:14:07 +0000 rtld_lock.h: Expand scope for IN_RTLD to avoid some conflicts with libc (cherry picked from commit 34ca6025ddfea9899024eb6e7617091c5bc5149a) --- libexec/rtld-elf/rtld_lock.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/rtld_lock.h b/libexec/rtld-elf/rtld_lock.h index cc1fd83169f8..9aa769b1f7e6 100644 --- a/libexec/rtld-elf/rtld_lock.h +++ b/libexec/rtld-elf/rtld_lock.h @@ -46,10 +46,14 @@ struct RtldLockInfo void (*at_fork)(void); }; +#if defined(IN_RTLD) || defined(PTHREAD_KERNEL) + void _rtld_thread_init(struct RtldLockInfo *) __exported; void _rtld_atfork_pre(int *) __exported; void _rtld_atfork_post(int *) __exported; +#endif /* IN_RTLD || PTHREAD_KERNEL */ + #ifdef IN_RTLD struct rtld_lock;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104231114.13NBEnP9012869>