4 files changed, 15 insertions, 3 deletions

diff --git a/gnu/usr.bin/gdb/Makefile b/gnu/usr.bin/gdb/Makefile
index 74a35982d92a..8f2870bb8637 100644
--- a/gnu/usr.bin/gdb/Makefile
+++ b/gnu/usr.bin/gdb/Makefile
@@ -2,4 +2,8 @@
 
 SUBDIR=	doc libgdb gdb gdbtui kgdb
 
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+=gdbserver
+.endif
+
 .include <bsd.subdir.mk>
diff --git a/gnu/usr.bin/gdb/arch/amd64/Makefile b/gnu/usr.bin/gdb/arch/amd64/Makefile
index a7d37f12a402..94d7bbbcdc35 100644
--- a/gnu/usr.bin/gdb/arch/amd64/Makefile
+++ b/gnu/usr.bin/gdb/arch/amd64/Makefile
@@ -7,7 +7,7 @@ LIBSRCS+= amd64-nat.c amd64bsd-nat.c amd64fbsd-nat.c
 .endif
 LIBSRCS+= solib.c solib-svr4.c
 LIBSRCS+= amd64-tdep.c amd64fbsd-tdep.c i386-tdep.c i386bsd-tdep.c \
-	i386fbsd-tdep.c	i387-tdep.c
+	i386fbsd-tdep-fixed.c	i387-tdep.c
 
 nm.h:
 	echo '#include "i386/nm-fbsd64.h"' > ${.TARGET}
@@ -17,3 +17,8 @@ tm.h:
 
 xm.h:
 	echo '#include "i386/xm-i386.h"' > ${.TARGET}
+
+i386fbsd-tdep-fixed.c: i386fbsd-tdep.c
+	sed -e '48s/^static //' ${.ALLSRC} > ${.TARGET}
+
+CLEANFILES+= i386fbsd-tdep-fixed.c
diff --git a/gnu/usr.bin/gdb/arch/i386/Makefile b/gnu/usr.bin/gdb/arch/i386/Makefile
index fd4a880e8a17..f0286593f30e 100644
--- a/gnu/usr.bin/gdb/arch/i386/Makefile
+++ b/gnu/usr.bin/gdb/arch/i386/Makefile
@@ -6,7 +6,7 @@ LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
 LIBSRCS+= i386-nat.c i386bsd-nat.c i386fbsd-nat.c
 .endif
 LIBSRCS+= solib.c solib-svr4.c
-LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep.c i387-tdep.c
+LIBSRCS+= i386-tdep.c i386bsd-tdep.c i386fbsd-tdep-fixed.c i387-tdep.c
 
 nm.h:
 	echo '#include "i386/nm-fbsd.h"' > ${.TARGET}
@@ -16,3 +16,7 @@ tm.h:
 
 xm.h:
 	echo '#include "i386/xm-i386.h"' > ${.TARGET}
+
+i386fbsd-tdep-fixed.c: i386fbsd-tdep.c
+	sed -e '48s/^static\ //' ${.ALLSRC} > ${.TARGET}
+CLEANFILES += i386fbsd-tdep-fixed.c
diff --git a/gnu/usr.bin/gdb/kgdb/kgdb.h b/gnu/usr.bin/gdb/kgdb/kgdb.h
index 397a6709d796..d723a5ff7fa4 100644
--- a/gnu/usr.bin/gdb/kgdb/kgdb.h
+++ b/gnu/usr.bin/gdb/kgdb/kgdb.h
@@ -32,7 +32,6 @@
 struct thread_info;
 
 extern kvm_t *kvm;
-extern int verbose;
 
 struct kthr {
 	struct kthr	*next;