* config/powerpc/ppc-sim.mt (TDEPFILES): Remove solib.o. * config/powerpc/ppc-eabi.mt (TDEPFILES): Remove solib.o. * config/powerpc/linux.mt (TDEPFILES): Remove solib.o. * config/tm-linux.h: Don't include "solib.h". * symfile.c, stack.c, remote.c, infrun.c: Include "solib.h". * infcmd.c, fork-child.c, corelow.c, breakpoint.c: Include "solib.h". * Makefile.in (COMMON_OBS): Add solib.o. Update dependencies. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/gdb/Makefile.in,v retrieving revision 1.652 diff -p -u -r1.652 Makefile.in --- Makefile.in 31 Oct 2004 20:47:55 -0000 1.652 +++ Makefile.in 11 Nov 2004 19:23:12 -0000 @@ -925,6 +925,7 @@ COMMON_OBS = $(DEPFILES) $(YYOBJ) \ nlmread.o serial.o mdebugread.o top.o utils.o \ ui-file.o \ user-regs.o \ + solib.o \ frame.o frame-unwind.o doublest.o \ frame-base.o \ gnu-v2-abi.o gnu-v3-abi.o hpacc-abi.o cp-abi.o cp-support.o \ @@ -1749,7 +1750,7 @@ breakpoint.o: breakpoint.c $(defs_h) $(s $(gdb_string_h) $(demangle_h) $(annotate_h) $(symfile_h) \ $(objfiles_h) $(source_h) $(linespec_h) $(completer_h) $(gdb_h) \ $(ui_out_h) $(cli_script_h) $(gdb_assert_h) $(block_h) $(solist_h) \ - $(observer_h) $(gdb_events_h) + $(observer_h) $(solib_h) $(gdb_events_h) bsd-kvm.o: bsd-kvm.c $(defs_h) $(cli_cmds_h) $(command_h) $(frame_h) \ $(regcache_h) $(target_h) $(value_h) $(gdbcore_h) $(gdb_assert_h) \ $(readline_h) $(bsd_kvm_h) @@ -1792,7 +1793,7 @@ corefile.o: corefile.c $(defs_h) $(gdb_s corelow.o: corelow.c $(defs_h) $(arch_utils_h) $(gdb_string_h) $(frame_h) \ $(inferior_h) $(symtab_h) $(command_h) $(bfd_h) $(target_h) \ $(gdbcore_h) $(gdbthread_h) $(regcache_h) $(regset_h) $(symfile_h) \ - $(exec_h) $(readline_h) $(observer_h) $(gdb_assert_h) + $(exec_h) $(readline_h) $(observer_h) $(gdb_assert_h) $(solib_h) core-regset.o: core-regset.c $(defs_h) $(command_h) $(gdbcore_h) \ $(inferior_h) $(target_h) $(gdb_string_h) $(gregset_h) cp-abi.o: cp-abi.c $(defs_h) $(value_h) $(cp_abi_h) $(command_h) $(gdbcmd_h) \ @@ -1910,7 +1911,7 @@ f-lang.o: f-lang.c $(defs_h) $(gdb_strin $(valprint_h) $(value_h) fork-child.o: fork-child.c $(defs_h) $(gdb_string_h) $(frame_h) \ $(inferior_h) $(target_h) $(gdb_wait_h) $(gdb_vfork_h) $(gdbcore_h) \ - $(terminal_h) $(gdbthread_h) $(command_h) + $(terminal_h) $(gdbthread_h) $(command_h) $(solib_h) frame-base.o: frame-base.c $(defs_h) $(frame_base_h) $(frame_h) \ $(gdb_obstack_h) frame.o: frame.c $(defs_h) $(frame_h) $(target_h) $(value_h) $(inferior_h) \ @@ -2081,7 +2082,7 @@ infcmd.o: infcmd.c $(defs_h) $(gdb_strin $(symfile_h) $(gdbcore_h) $(target_h) $(language_h) $(symfile_h) \ $(objfiles_h) $(completer_h) $(ui_out_h) $(event_top_h) \ $(parser_defs_h) $(regcache_h) $(reggroups_h) $(block_h) \ - $(gdb_assert_h) + $(gdb_assert_h) $(solib_h) inf-loop.o: inf-loop.c $(defs_h) $(inferior_h) $(target_h) $(event_loop_h) \ $(event_top_h) $(inf_loop_h) $(remote_h) inflow.o: inflow.c $(defs_h) $(frame_h) $(inferior_h) $(command_h) \ @@ -2097,7 +2098,7 @@ infrun.o: infrun.c $(defs_h) $(gdb_strin $(inferior_h) $(breakpoint_h) $(gdb_wait_h) $(gdbcore_h) $(gdbcmd_h) \ $(cli_script_h) $(target_h) $(gdbthread_h) $(annotate_h) \ $(symfile_h) $(top_h) $(inf_loop_h) $(regcache_h) $(value_h) \ - $(observer_h) $(language_h) $(gdb_assert_h) + $(observer_h) $(language_h) $(gdb_assert_h) $(infrun_c) inftarg.o: inftarg.c $(defs_h) $(frame_h) $(inferior_h) $(target_h) \ $(gdbcore_h) $(command_h) $(gdb_stat_h) $(observer_h) $(gdb_wait_h) \ $(inflow_h) @@ -2382,7 +2383,7 @@ regset.o: regset.c $(defs_h) $(regset_h) remote.o: remote.c $(defs_h) $(gdb_string_h) $(inferior_h) $(bfd_h) \ $(symfile_h) $(target_h) $(gdbcmd_h) $(objfiles_h) $(gdb_stabs_h) \ $(gdbthread_h) $(remote_h) $(regcache_h) $(value_h) $(gdb_assert_h) \ - $(event_loop_h) $(event_top_h) $(inf_loop_h) $(serial_h) \ + $(solib_h) $(event_loop_h) $(event_top_h) $(inf_loop_h) $(serial_h) \ $(gdbcore_h) $(remote_fileio_h) remote-e7000.o: remote-e7000.c $(defs_h) $(gdbcore_h) $(gdbarch_h) \ $(inferior_h) $(target_h) $(value_h) $(command_h) $(gdb_string_h) \ @@ -2603,7 +2604,8 @@ stack.o: stack.c $(defs_h) $(gdb_string_ $(gdbtypes_h) $(expression_h) $(language_h) $(frame_h) $(gdbcmd_h) \ $(gdbcore_h) $(target_h) $(source_h) $(breakpoint_h) $(demangle_h) \ $(inferior_h) $(annotate_h) $(ui_out_h) $(block_h) $(stack_h) \ - $(gdb_assert_h) $(dictionary_h) $(reggroups_h) $(regcache_h) + $(gdb_assert_h) $(dictionary_h) $(reggroups_h) $(regcache_h) \ + $(solib_h) std-regs.o: std-regs.c $(defs_h) $(user_regs_h) $(frame_h) $(gdbtypes_h) \ $(value_h) $(gdb_string_h) stop-gdb.o: stop-gdb.c $(defs_h) @@ -2612,7 +2614,7 @@ symfile.o: symfile.c $(defs_h) $(bfdlink $(objfiles_h) $(source_h) $(gdbcmd_h) $(breakpoint_h) $(language_h) \ $(complaints_h) $(demangle_h) $(inferior_h) $(filenames_h) \ $(gdb_stabs_h) $(gdb_obstack_h) $(completer_h) $(bcache_h) \ - $(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) \ + $(hashtab_h) $(readline_h) $(gdb_assert_h) $(block_h) $(solib_h) \ $(gdb_string_h) $(gdb_stat_h) symfile-mem.o: symfile-mem.c $(defs_h) $(symtab_h) $(gdbcore_h) \ $(objfiles_h) $(gdbcmd_h) $(target_h) $(value_h) $(symfile_h) Index: breakpoint.c =================================================================== RCS file: /cvs/src/src/gdb/breakpoint.c,v retrieving revision 1.184 diff -p -u -r1.184 breakpoint.c --- breakpoint.c 29 Oct 2004 20:23:04 -0000 1.184 +++ breakpoint.c 11 Nov 2004 19:23:13 -0000 @@ -51,7 +51,7 @@ #include "block.h" #include "solist.h" #include "observer.h" - +#include "solib.h" #include "gdb-events.h" /* Prototypes for local functions. */ Index: corelow.c =================================================================== RCS file: /cvs/src/src/gdb/corelow.c,v retrieving revision 1.43 diff -p -u -r1.43 corelow.c --- corelow.c 29 Oct 2004 20:23:05 -0000 1.43 +++ corelow.c 11 Nov 2004 19:23:13 -0000 @@ -45,6 +45,7 @@ #include "readline/readline.h" #include "observer.h" #include "gdb_assert.h" +#include "solib.h" #ifndef O_BINARY #define O_BINARY 0 Index: fork-child.c =================================================================== RCS file: /cvs/src/src/gdb/fork-child.c,v retrieving revision 1.23 diff -p -u -r1.23 fork-child.c --- fork-child.c 30 Sep 2004 20:15:39 -0000 1.23 +++ fork-child.c 11 Nov 2004 19:23:13 -0000 @@ -33,7 +33,7 @@ #include "terminal.h" #include "gdbthread.h" #include "command.h" /* for dont_repeat () */ - +#include "solib.h" #include /* This just gets used as a default if we can't find SHELL. */ Index: infcmd.c =================================================================== RCS file: /cvs/src/src/gdb/infcmd.c,v retrieving revision 1.124 diff -p -u -r1.124 infcmd.c --- infcmd.c 29 Oct 2004 20:23:08 -0000 1.124 +++ infcmd.c 11 Nov 2004 19:23:13 -0000 @@ -45,6 +45,7 @@ #include "block.h" #include #include "gdb_assert.h" +#include "solib.h" /* Functions exported for general use, in inferior.h: */ Index: infrun.c =================================================================== RCS file: /cvs/src/src/gdb/infrun.c,v retrieving revision 1.181 diff -p -u -r1.181 infrun.c --- infrun.c 31 Oct 2004 17:38:15 -0000 1.181 +++ infrun.c 11 Nov 2004 19:23:13 -0000 @@ -45,6 +45,7 @@ #include "observer.h" #include "language.h" #include "gdb_assert.h" +#include "solib.c" /* Prototypes for local functions */ Index: remote.c =================================================================== RCS file: /cvs/src/src/gdb/remote.c,v retrieving revision 1.152 diff -p -u -r1.152 remote.c --- remote.c 27 Oct 2004 20:03:50 -0000 1.152 +++ remote.c 11 Nov 2004 19:23:13 -0000 @@ -40,6 +40,7 @@ #include "regcache.h" #include "value.h" #include "gdb_assert.h" +#include "solib.h" #include #include Index: stack.c =================================================================== RCS file: /cvs/src/src/gdb/stack.c,v retrieving revision 1.115 diff -p -u -r1.115 stack.c --- stack.c 30 Oct 2004 21:16:10 -0000 1.115 +++ stack.c 11 Nov 2004 19:23:13 -0000 @@ -45,6 +45,7 @@ #include "dictionary.h" #include "reggroups.h" #include "regcache.h" +#include "solib.h" /* Prototypes for exported functions. */ Index: symfile.c =================================================================== RCS file: /cvs/src/src/gdb/symfile.c,v retrieving revision 1.144 diff -p -u -r1.144 symfile.c --- symfile.c 23 Oct 2004 16:18:09 -0000 1.144 +++ symfile.c 11 Nov 2004 19:23:15 -0000 @@ -48,6 +48,7 @@ #include "readline/readline.h" #include "gdb_assert.h" #include "block.h" +#include "solib.h" #include #include Index: config/tm-linux.h =================================================================== RCS file: /cvs/src/src/gdb/config/tm-linux.h,v retrieving revision 1.6 diff -p -u -r1.6 tm-linux.h --- config/tm-linux.h 3 Sep 2004 17:13:47 -0000 1.6 +++ config/tm-linux.h 11 Nov 2004 19:23:15 -0000 @@ -31,5 +31,3 @@ /* We need this file for the SOLIB_TRAMPOLINE stuff. */ #include "config/tm-sysv4.h" - -#include "solib.h" /* Support for shared libraries. */ Index: config/powerpc/linux.mt =================================================================== RCS file: /cvs/src/src/gdb/config/powerpc/linux.mt,v retrieving revision 1.7 diff -p -u -r1.7 linux.mt --- config/powerpc/linux.mt 13 Sep 2004 20:55:41 -0000 1.7 +++ config/powerpc/linux.mt 11 Nov 2004 19:23:15 -0000 @@ -1,5 +1,5 @@ # Target: Motorola PPC on Linux -TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o solib.o \ +TDEPFILES= rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o \ solib-svr4.o solib-legacy.o corelow.o DEPRECATED_TM_FILE= tm-linux.h Index: config/powerpc/ppc-eabi.mt =================================================================== RCS file: /cvs/src/src/gdb/config/powerpc/ppc-eabi.mt,v retrieving revision 1.6 diff -p -u -r1.6 ppc-eabi.mt --- config/powerpc/ppc-eabi.mt 13 Sep 2004 20:55:41 -0000 1.6 +++ config/powerpc/ppc-eabi.mt 11 Nov 2004 19:23:15 -0000 @@ -1,3 +1,3 @@ # Target: PowerPC running eabi -TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib.o solib-svr4.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib-svr4.o DEPRECATED_TM_FILE= tm-ppc-eabi.h Index: config/powerpc/ppc-sim.mt =================================================================== RCS file: /cvs/src/src/gdb/config/powerpc/ppc-sim.mt,v retrieving revision 1.6 diff -p -u -r1.6 ppc-sim.mt --- config/powerpc/ppc-sim.mt 13 Sep 2004 20:55:41 -0000 1.6 +++ config/powerpc/ppc-sim.mt 11 Nov 2004 19:23:15 -0000 @@ -1,5 +1,5 @@ # Target: PowerPC running eabi and including the simulator -TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib.o solib-svr4.o +TDEPFILES= rs6000-tdep.o monitor.o dsrec.o ppcbug-rom.o dink32-rom.o ppc-bdm.o ocd.o remote-sds.o ppc-sysv-tdep.o solib-svr4.o DEPRECATED_TM_FILE= tm-ppc-eabi.h SIM_OBS = remote-sim.o