Source changes to allow building a cross-debugger. Move solib.c and

solib-svr4.c to the MD makefiles because they are native files for
alpha and sparc64, but target files for amd64, i386 and ia64.

Note that kgdb(1) does not yet build as a cross-debugger due to
libkvm.

16 files changed, 29 insertions, 5 deletions

diff --git a/gnu/usr.bin/gdb/arch/alpha/Makefile b/gnu/usr.bin/gdb/arch/alpha/Makefile
index 44633e4..6ed4368 100644
--- a/gnu/usr.bin/gdb/arch/alpha/Makefile
+++ b/gnu/usr.bin/gdb/arch/alpha/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .if !defined(GDB_CROSS_DEBUGGER)
-LIBSRCS+= core-regset.c solib-legacy.c
+LIBSRCS+= core-regset.c solib.c solib-legacy.c solib-svr4.c
 LIBSRCS+= alphabsd-nat.c
 .endif
 LIBSRCS+= alpha-mdebug-tdep.c alpha-tdep.c alphabsd-tdep.c alphafbsd-tdep.c
diff --git a/gnu/usr.bin/gdb/arch/alpha/config.h b/gnu/usr.bin/gdb/arch/alpha/config.h
index c598b2a..8f132c0 100644
--- a/gnu/usr.bin/gdb/arch/alpha/config.h
+++ b/gnu/usr.bin/gdb/arch/alpha/config.h
@@ -174,7 +174,9 @@
 #define GDB_TM_FILE config/alpha/tm-fbsd.h
 
 /* nativefile */
+#ifndef CROSS_DEBUGGER
 #define GDB_NM_FILE config/alpha/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/alpha/init.c b/gnu/usr.bin/gdb/arch/alpha/init.c
index 153c975..d2dc208 100644
--- a/gnu/usr.bin/gdb/arch/alpha/init.c
+++ b/gnu/usr.bin/gdb/arch/alpha/init.c
@@ -120,14 +120,18 @@ initialize_all_files (void)
   _initialize_ser_hardwire ();
   _initialize_ser_pipe ();
   _initialize_ser_tcp ();
+#ifndef CROSS_DEBUGGER
   _initialize_kernel_u_addr ();
   _initialize_infptrace ();
   _initialize_inftarg ();
   _initialize_solib ();
   _initialize_svr4_solib ();
   _initialize_svr4_lm ();
+#endif
   _initialize_corelow ();
+#ifndef CROSS_DEBUGGER
   _initialize_core_regset ();
+#endif
   _initialize_remote ();
   _initialize_dcache ();
   _initialize_sr_support ();
diff --git a/gnu/usr.bin/gdb/arch/amd64/Makefile b/gnu/usr.bin/gdb/arch/amd64/Makefile
index f86bc2c..a7d37f1 100644
--- a/gnu/usr.bin/gdb/arch/amd64/Makefile
+++ b/gnu/usr.bin/gdb/arch/amd64/Makefile
@@ -5,6 +5,7 @@ GENSRCS+= xm.h
 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
 
diff --git a/gnu/usr.bin/gdb/arch/amd64/config.h b/gnu/usr.bin/gdb/arch/amd64/config.h
index ce352db..ac81c54 100644
--- a/gnu/usr.bin/gdb/arch/amd64/config.h
+++ b/gnu/usr.bin/gdb/arch/amd64/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-fbsd64.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/amd64/init.c b/gnu/usr.bin/gdb/arch/amd64/init.c
index 39b9eac..1b296f4 100644
--- a/gnu/usr.bin/gdb/arch/amd64/init.c
+++ b/gnu/usr.bin/gdb/arch/amd64/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 ();
@@ -136,6 +137,7 @@ initialize_all_files (void)
   _initialize_gcore ();
   _initialize_fbsd_proc ();
   _initialize_thread_db ();
+#endif
   _initialize_remote ();
   _initialize_dcache ();
   _initialize_sr_support ();
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 ();
diff --git a/gnu/usr.bin/gdb/arch/ia64/Makefile b/gnu/usr.bin/gdb/arch/ia64/Makefile
index 191e139..5462cc2 100644
--- a/gnu/usr.bin/gdb/arch/ia64/Makefile
+++ b/gnu/usr.bin/gdb/arch/ia64/Makefile
@@ -4,6 +4,7 @@
 LIBSRCS+= fbsd-proc.c gcore.c
 LIBSRCS+= ia64-fbsd-nat.c
 .endif
+LIBSRCS+= solib.c solib-svr4.c
 LIBSRCS+= ia64-fbsd-tdep.c ia64-tdep.c
 
 nm.h:
diff --git a/gnu/usr.bin/gdb/arch/ia64/config.h b/gnu/usr.bin/gdb/arch/ia64/config.h
index f912b8a..5faa96b 100644
--- a/gnu/usr.bin/gdb/arch/ia64/config.h
+++ b/gnu/usr.bin/gdb/arch/ia64/config.h
@@ -174,7 +174,9 @@
 #define GDB_TM_FILE config/ia64/tm-fbsd.h
 
 /* nativefile */
+#ifndef CROSS_DEBUGGER
 #define GDB_NM_FILE config/ia64/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/ia64/init.c b/gnu/usr.bin/gdb/arch/ia64/init.c
index 5e3ec18..c2cd71f 100644
--- a/gnu/usr.bin/gdb/arch/ia64/init.c
+++ b/gnu/usr.bin/gdb/arch/ia64/init.c
@@ -124,12 +124,14 @@ initialize_all_files (void)
   _initialize_ser_hardwire ();
   _initialize_ser_pipe ();
   _initialize_ser_tcp ();
+#ifndef CROSS_DEBUGGER
   _initialize_fbsd_proc ();
   _initialize_gcore ();
   _initialize_ia64_fbsd_nat ();
   _initialize_kernel_u_addr ();
   _initialize_infptrace ();
   _initialize_inftarg ();
+#endif
   _initialize_remote ();
   _initialize_dcache ();
   _initialize_sr_support ();
diff --git a/gnu/usr.bin/gdb/arch/sparc64/Makefile b/gnu/usr.bin/gdb/arch/sparc64/Makefile
index 69cce7e..b985711 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/Makefile
+++ b/gnu/usr.bin/gdb/arch/sparc64/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 .if !defined(GDB_CROSS_DEBUGGER)
-LIBSRCS+= solib-legacy.c
+LIBSRCS+= solib.c solib-legacy.c solib-svr4.c
 LIBSRCS+= sparc-nat.c sparc64-nat.c sparc64fbsd-nat.c
 .endif
 LIBSRCS+= sparc-tdep.c sparc64-tdep.c sparc64fbsd-tdep.c
diff --git a/gnu/usr.bin/gdb/arch/sparc64/config.h b/gnu/usr.bin/gdb/arch/sparc64/config.h
index bf0c408..5527a79 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/config.h
+++ b/gnu/usr.bin/gdb/arch/sparc64/config.h
@@ -174,7 +174,9 @@
 #define GDB_TM_FILE config/sparc/tm-fbsd.h
 
 /* nativefile */
+#ifndef CROSS_DEBUGGER
 #define GDB_NM_FILE config/sparc/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/sparc64/init.c b/gnu/usr.bin/gdb/arch/sparc64/init.c
index 0dfed1d..25f4658 100644
--- a/gnu/usr.bin/gdb/arch/sparc64/init.c
+++ b/gnu/usr.bin/gdb/arch/sparc64/init.c
@@ -123,6 +123,7 @@ initialize_all_files (void)
   _initialize_ser_hardwire ();
   _initialize_ser_pipe ();
   _initialize_ser_tcp ();
+#ifndef CROSS_DEBUGGER
   _initialize_sparc64fbsd_nat ();
   _initialize_sparc64_nat ();
   _initialize_sparc_nat ();
@@ -132,6 +133,7 @@ initialize_all_files (void)
   _initialize_solib ();
   _initialize_svr4_solib ();
   _initialize_svr4_lm ();
+#endif
   _initialize_remote ();
   _initialize_dcache ();
   _initialize_sr_support ();
diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile
index 5a733af..0a7fad6 100644
--- a/gnu/usr.bin/gdb/libgdb/Makefile
+++ b/gnu/usr.bin/gdb/libgdb/Makefile
@@ -37,9 +37,8 @@ SRCS=	annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c \
 	p-exp.y p-lang.c p-typeprint.c p-valprint.c parse.c printcmd.c \
 	regcache.c reggroups.c remote-fileio.c remote-utils.c remote.c \
 	scm-exp.c scm-lang.c scm-valprint.c sentinel-frame.c ser-pipe.c \
-	ser-tcp.c ser-unix.c serial.c signals.c solib.c solib-svr4.c \
-	source.c stabsread.c stack.c std-regs.c symfile.c symmisc.c \
-	symtab.c \
+	ser-tcp.c ser-unix.c serial.c signals.c source.c stabsread.c \
+	stack.c std-regs.c symfile.c symmisc.c symtab.c \
 	target.c thread.c top.c tracepoint.c trad-frame.c tui-command.c \
 	tui-data.c tui-disasm.c tui-file.c tui-hooks.c tui-interp.c \
 	tui-io.c tui-layout.c tui-out.c tui-regs.c tui-source.c \