From 2eebf6371b24d4a1d7440c49884cce06557dbaac Mon Sep 17 00:00:00 2001
From: vangyzen <vangyzen@FreeBSD.org>
Date: Fri, 26 May 2017 15:56:28 +0000
Subject: [PATCH] libthr: fix warnings at WARNS=6

Fix more warnings about redundant declarations.

Reviewed by:	kib emaste
MFC after:	3 days
Sponsored by:	Dell EMC
Differential Revision:	https://reviews.freebsd.org/D10932
---
 lib/libthr/arch/aarch64/include/pthread_md.h | 2 --
 lib/libthr/arch/arm/include/pthread_md.h     | 2 --
 lib/libthr/arch/mips/include/pthread_md.h    | 2 --
 lib/libthr/arch/powerpc/include/pthread_md.h | 2 --
 lib/libthr/arch/riscv/include/pthread_md.h   | 2 --
 lib/libthr/thread/thr_private.h              | 4 +++-
 6 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/libthr/arch/aarch64/include/pthread_md.h b/lib/libthr/arch/aarch64/include/pthread_md.h
index 14c18939e979..d14bce244f8f 100644
--- a/lib/libthr/arch/aarch64/include/pthread_md.h
+++ b/lib/libthr/arch/aarch64/include/pthread_md.h
@@ -72,8 +72,6 @@ _tcb_get(void)
 	return (tcb);
 }
 
-extern struct pthread *_thr_initial;
-
 static __inline struct pthread *
 _get_curthread(void)
 {
diff --git a/lib/libthr/arch/arm/include/pthread_md.h b/lib/libthr/arch/arm/include/pthread_md.h
index 9a6b5233e515..4ae797170e5f 100644
--- a/lib/libthr/arch/arm/include/pthread_md.h
+++ b/lib/libthr/arch/arm/include/pthread_md.h
@@ -75,8 +75,6 @@ _tcb_get(void)
 #endif
 }
 
-extern struct pthread *_thr_initial;
-
 static __inline struct pthread *
 _get_curthread(void)
 {
diff --git a/lib/libthr/arch/mips/include/pthread_md.h b/lib/libthr/arch/mips/include/pthread_md.h
index d27ecf073056..ebb6b36e6a1a 100644
--- a/lib/libthr/arch/mips/include/pthread_md.h
+++ b/lib/libthr/arch/mips/include/pthread_md.h
@@ -120,8 +120,6 @@ _tcb_get(void)
 #  endif /* ! __mips_n64 */
 #endif /* ! TLS_USE_SYSARCH */
 
-extern struct pthread *_thr_initial;
-
 static __inline struct pthread *
 _get_curthread(void)
 {
diff --git a/lib/libthr/arch/powerpc/include/pthread_md.h b/lib/libthr/arch/powerpc/include/pthread_md.h
index 544ee1c5d5fc..699233e175e5 100644
--- a/lib/libthr/arch/powerpc/include/pthread_md.h
+++ b/lib/libthr/arch/powerpc/include/pthread_md.h
@@ -80,8 +80,6 @@ _tcb_get(void)
 	return ((struct tcb *)(_tp - TP_OFFSET));
 }
 
-extern struct pthread *_thr_initial;
-
 static __inline struct pthread *
 _get_curthread(void)
 {
diff --git a/lib/libthr/arch/riscv/include/pthread_md.h b/lib/libthr/arch/riscv/include/pthread_md.h
index 3f5107815de3..499da5f5a8f8 100644
--- a/lib/libthr/arch/riscv/include/pthread_md.h
+++ b/lib/libthr/arch/riscv/include/pthread_md.h
@@ -78,8 +78,6 @@ _tcb_get(void)
 	return ((struct tcb *)(_tp - TP_OFFSET));
 }
 
-extern struct pthread *_thr_initial;
-
 static __inline struct pthread *
 _get_curthread(void)
 {
diff --git a/lib/libthr/thread/thr_private.h b/lib/libthr/thread/thr_private.h
index 69b76b95c434..4c9245e7b050 100644
--- a/lib/libthr/thread/thr_private.h
+++ b/lib/libthr/thread/thr_private.h
@@ -69,6 +69,9 @@ __NULLABILITY_PRAGMA_PUSH
 	WEAK_REF(func, SYM_FBP10(sym));			\
 	SYM_DEFAULT(sym, SYM_FBP10(sym), FBSDprivate_1.0)
 
+struct pthread;
+extern struct pthread	*_thr_initial __hidden;
+
 #include "pthread_md.h"
 #include "thr_umtx.h"
 #include "thread_db.h"
@@ -711,7 +714,6 @@ extern int __isthreaded;
  */
 
 extern char		*_usrstack __hidden;
-extern struct pthread	*_thr_initial __hidden;
 
 /* For debugger */
 extern int		_libthr_debug;