The branch stable/13 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=520806c476b9f628c2e8bfbc4c3835aeeec26c2e
commit 520806c476b9f628c2e8bfbc4c3835aeeec26c2e
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-04-05 04:12:22 +0000
Commit: Konstantin Belousov <k...@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;
_______________________________________________
dev-commits-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "dev-commits-src-all-unsubscr...@freebsd.org"
