Module Name: src
Committed By: rin
Date: Sun Oct 4 10:34:18 UTC 2020
Modified Files:
src/sys/arch/m68k/include: mcontext.h
src/sys/arch/powerpc/include: mcontext.h
Log Message:
Add missing __{BEGIN,END}_DECLS in order to catch up with
sanitizer_linux_libcdep.cc rev 1.17:
http://cvsweb.netbsd.org/bsdweb.cgi/src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux_libcdep.cc#rev1.17
Fix build with HAVE_GCC=9.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/m68k/include/mcontext.h
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/mcontext.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/m68k/include/mcontext.h
diff -u src/sys/arch/m68k/include/mcontext.h:1.11 src/sys/arch/m68k/include/mcontext.h:1.12
--- src/sys/arch/m68k/include/mcontext.h:1.11 Mon Sep 7 00:32:00 2020
+++ src/sys/arch/m68k/include/mcontext.h Sun Oct 4 10:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.11 2020/09/07 00:32:00 mrg Exp $ */
+/* $NetBSD: mcontext.h,v 1.12 2020/10/04 10:34:18 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -119,6 +119,8 @@ typedef struct {
__CTASSERT(TLS_TP_OFFSET + sizeof(struct tls_tcb) < 0x8000);
__CTASSERT(TLS_TP_OFFSET % sizeof(struct tls_tcb) == 0);
+__BEGIN_DECLS
+
void *_lwp_getprivate(void);
void _lwp_setprivate(void *);
@@ -136,6 +138,7 @@ __lwp_settcb(struct tls_tcb *__tcb)
__tcb += TLS_TP_OFFSET / sizeof(*__tcb) + 1;
_lwp_setprivate(__tcb);
}
+__END_DECLS
#endif
#endif /* !_M68K_MCONTEXT_H_ */
Index: src/sys/arch/powerpc/include/mcontext.h
diff -u src/sys/arch/powerpc/include/mcontext.h:1.21 src/sys/arch/powerpc/include/mcontext.h:1.22
--- src/sys/arch/powerpc/include/mcontext.h:1.21 Mon Jun 22 05:34:57 2020
+++ src/sys/arch/powerpc/include/mcontext.h Sun Oct 4 10:34:18 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.21 2020/06/22 05:34:57 rin Exp $ */
+/* $NetBSD: mcontext.h,v 1.22 2020/10/04 10:34:18 rin Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -153,6 +153,8 @@ typedef struct {
#define TLS_DTV_OFFSET 0x8000
__CTASSERT(TLS_TP_OFFSET + sizeof(struct tls_tcb) < 0x8000);
+__BEGIN_DECLS
+
static __inline void *
__lwp_gettcb_fast(void)
{
@@ -180,6 +182,7 @@ __lwp_settcb(void *__tcb)
_lwp_setprivate(__tcb);
}
+__END_DECLS
#endif /* _RTLD_SOURCE || _LIBC_SOURCE || __LIBPTHREAD_SOURCE__ */
#endif /* !_POWERPC_MCONTEXT_H_ */
