Remove unused variables. Add required headers and function

declarations.

7 files changed, 12 insertions, 6 deletions

diff --git a/lib/libc/sparc64/fpu/fpu.c b/lib/libc/sparc64/fpu/fpu.c
index 63814252d9f6..63a3c0d2ec2c 100644
--- a/lib/libc/sparc64/fpu/fpu.c
+++ b/lib/libc/sparc64/fpu/fpu.c
@@ -214,7 +214,6 @@ __fpu_mov(struct fpemu *fe, int type, int rd, int rs2, u_int32_t nand,
     u_int32_t xor)
 {
 	u_int64_t tmp64;
-	u_int32_t *p32;
 	int i;
 
 	if (type == FTYPE_INT || type == FTYPE_SNG)
diff --git a/lib/libc/sparc64/fpu/fpu_qp.c b/lib/libc/sparc64/fpu/fpu_qp.c
index 8b4b7a695b7a..88df0458c48b 100644
--- a/lib/libc/sparc64/fpu/fpu_qp.c
+++ b/lib/libc/sparc64/fpu/fpu_qp.c
@@ -96,7 +96,6 @@ int \
 _Qp_f ## name(u_int *a, u_int *b) \
 { \
 	struct fpemu fe; \
-	struct fpn *r; \
 	__asm __volatile("stx %%fsr, %0" : "=m" (fe.fe_fsr) :); \
 	fe.fe_f1.fp_sign = a[0] >> 31; \
 	fe.fe_f1.fp_sticky = 0; \
diff --git a/lib/libc/sparc64/gen/signalcontext.c b/lib/libc/sparc64/gen/signalcontext.c
index f47e81ccd48b..622f36f5bd75 100644
--- a/lib/libc/sparc64/gen/signalcontext.c
+++ b/lib/libc/sparc64/gen/signalcontext.c
@@ -28,15 +28,16 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/signal.h>
 #include <sys/ucontext.h>
 
 #include <machine/frame.h>
 #include <machine/sigframe.h>
 
 #include <errno.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <strings.h>
 #include <unistd.h>
 
 __weak_reference(__signalcontext, signalcontext);
diff --git a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
index 63fcb82eb418..294b18f2b3ff 100644
--- a/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_sigtramp_setup.c
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <stdlib.h>
 
 extern char __sigtramp[];
+extern int sysarch(int op, char *parms);
 
 static const struct sparc_sigtramp_install_args sia = { __sigtramp, NULL };
 
@@ -42,5 +43,5 @@ void
 __sparc_sigtramp_setup(void)
 {
 
-	sysarch(SPARC_SIGTRAMP_INSTALL, &sia);
+	sysarch(SPARC_SIGTRAMP_INSTALL, (char *)&sia);
 }
diff --git a/lib/libc/sparc64/sys/__sparc_utrap.c b/lib/libc/sparc64/sys/__sparc_utrap.c
index e7c503f469c3..8b161b81d79d 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap.c
@@ -36,8 +36,10 @@ __FBSDID("$FreeBSD$");
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
+#include "fpu_extern.h"
 #include "__sparc_utrap_private.h"
 
 static const char *utrap_msg[] = {
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_install.c b/lib/libc/sparc64/sys/__sparc_utrap_install.c
index 9ed61c72a87f..d1881088a141 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_install.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_install.c
@@ -30,6 +30,8 @@ __FBSDID("$FreeBSD$");
 #include <machine/utrap.h>
 #include <machine/sysarch.h>
 
+extern int sysarch(int op, char *parms);
+
 int
 __sparc_utrap_install(utrap_entry_t type, utrap_handler_t new_precise,
     utrap_handler_t new_deferred, utrap_handler_t *old_precise,
diff --git a/lib/libc/sparc64/sys/__sparc_utrap_setup.c b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
index 0f7a22d33f8c..749de2b63e3b 100644
--- a/lib/libc/sparc64/sys/__sparc_utrap_setup.c
+++ b/lib/libc/sparc64/sys/__sparc_utrap_setup.c
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
 
 #include "__sparc_utrap_private.h"
 
+extern int sysarch(int op, char *parms);
+
 static const struct sparc_utrap_args ua[] = {
 	{ UT_FP_DISABLED, __sparc_utrap_fp_disabled, NULL, NULL, NULL },
 	{ UT_FP_EXCEPTION_IEEE_754, __sparc_utrap_gen, NULL, NULL, NULL },
@@ -45,7 +47,7 @@ static const struct sparc_utrap_args ua[] = {
 };
 
 static const struct sparc_utrap_install_args uia[] = {
-	sizeof (ua) / sizeof (*ua), ua
+	{ sizeof (ua) / sizeof (*ua), ua }
 };
 
 void __sparc_utrap_setup(void) __attribute__((constructor));
@@ -54,5 +56,5 @@ void
 __sparc_utrap_setup(void)
 {
 
-	sysarch(SPARC_UTRAP_INSTALL, &uia);
+	sysarch(SPARC_UTRAP_INSTALL, (char *)&uia);
 }