Index: head/gnu/usr.bin/gdb/arch/amd64/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/arch/amd64/Makefile	(revision 169712)
+++ head/gnu/usr.bin/gdb/arch/amd64/Makefile	(revision 169713)
@@ -1,19 +1,24 @@
 # $FreeBSD$
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
 LIBSRCS+= fbsd-proc.c fbsd-threads.c gcore.c
 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}
 
 tm.h:
 	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
 
 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
Index: head/gnu/usr.bin/gdb/arch/i386/Makefile
===================================================================
--- head/gnu/usr.bin/gdb/arch/i386/Makefile	(revision 169712)
+++ head/gnu/usr.bin/gdb/arch/i386/Makefile	(revision 169713)
@@ -1,18 +1,22 @@
 # $FreeBSD$
 
 GENSRCS+= xm.h
 .if !defined(GDB_CROSS_DEBUGGER)
 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}
 
 tm.h:
 	echo '#include "i386/tm-fbsd.h"' > ${.TARGET}
 
 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