3 files changed, 5 insertions, 0 deletions
diff --git a/gnu/usr.bin/gdb/arch/i386/Makefile b/gnu/usr.bin/gdb/arch/i386/Makefile
index 2f89ddb..fd4a880 100644
--- a/gnu/usr.bin/gdb/arch/i386/Makefile
+++ b/gnu/usr.bin/gdb/arch/i386/Makefile
@@ -5,6 +5,7 @@ GENSRCS+= xm.h
 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
 
 nm.h:
diff --git a/gnu/usr.bin/gdb/arch/i386/config.h b/gnu/usr.bin/gdb/arch/i386/config.h
index 07d800f..793a4f2 100644
--- a/gnu/usr.bin/gdb/arch/i386/config.h
+++ b/gnu/usr.bin/gdb/arch/i386/config.h
@@ -174,7 +174,9 @@
 #define GDB_TM_FILE config/i386/tm-fbsd.h
 
 /* nativefile */
+#ifndef CROSS_DEBUGGER
 #define GDB_NM_FILE config/i386/nm-fbsd.h
+#endif
 
 /* Define to 1 so <sys/proc.h> gets a definition of anon_hdl.  Works
    around a <sys/proc.h> problem on IRIX 5.  */
diff --git a/gnu/usr.bin/gdb/arch/i386/init.c b/gnu/usr.bin/gdb/arch/i386/init.c
index dcce7ce..7675d8e 100644
--- a/gnu/usr.bin/gdb/arch/i386/init.c
+++ b/gnu/usr.bin/gdb/arch/i386/init.c
@@ -129,6 +129,7 @@ initialize_all_files (void)
   _initialize_ser_hardwire ();
   _initialize_ser_pipe ();
   _initialize_ser_tcp ();
+#ifndef CROSS_DEBUGGER
   _initialize_kernel_u_addr ();
   _initialize_infptrace ();
   _initialize_inftarg ();
@@ -138,6 +139,7 @@ initialize_all_files (void)
   _initialize_gcore ();
   _initialize_fbsd_proc ();
   _initialize_thread_db ();
+#endif
   _initialize_remote ();
   _initialize_dcache ();
   _initialize_sr_support ();