From 8d46538969f9b2068253d1c58c57d0784662e4fc Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 24 Oct 2007 21:16:30 +0000 Subject: [PATCH] * arm-wince-tdep.c: Include "solib.h" and "solib-target.h". (arm_wince_init_abi): Call set_solib_ops. * i386-cygwin-tdep.c: Include "solib.h" and "solib-target.h". (i386_cygwin_init_abi): Call set_solib_ops. * solib-target.c: Include "solib-target.h". (solib_target_so_ops): Make global. (_initialize_solib_target): Do not set current_target_so_ops. * solib-target.h: New file. * Makefile.in: Update dependencies. --- gdb/ChangeLog | 12 ++++++++++++ gdb/Makefile.in | 8 +++++--- gdb/arm-wince-tdep.c | 3 +++ gdb/i386-cygwin-tdep.c | 4 ++++ gdb/solib-target.c | 5 ++--- 5 files changed, 26 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index df587dabdf0..42865282903 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2007-10-24 Ulrich Weigand + + * arm-wince-tdep.c: Include "solib.h" and "solib-target.h". + (arm_wince_init_abi): Call set_solib_ops. + * i386-cygwin-tdep.c: Include "solib.h" and "solib-target.h". + (i386_cygwin_init_abi): Call set_solib_ops. + * solib-target.c: Include "solib-target.h". + (solib_target_so_ops): Make global. + (_initialize_solib_target): Do not set current_target_so_ops. + * solib-target.h: New file. + * Makefile.in: Update dependencies. + 2007-10-24 Ulrich Weigand * mips-irix-tdep.c: Include "gdb_string.h", "solib.h", "solib-irix.h". diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 56dc679c97c..cc11cfa7ab1 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -806,6 +806,7 @@ solib_irix_h = solib-irix.h solib_pa64_h = solib-pa64.h solib_som_h = solib-som.h solib_svr4_h = solib-svr4.h +solib_target_h = solib-target.h solist_h = solist.h $(symtab_h) source_h = source.h sparc64_tdep_h = sparc64-tdep.h $(sparc_tdep_h) @@ -1846,7 +1847,8 @@ arm-tdep.o: arm-tdep.c $(defs_h) $(frame_h) $(inferior_h) $(gdbcmd_h) \ $(dwarf2_frame_h) $(gdbtypes_h) $(prologue_value_h) \ $(target_descriptions_h) $(user_regs_h) arm-wince-tdep.o: arm-wince-tdep.c $(defs_h) $(osabi_h) \ - $(gdbcore_h) $(target_h) $(gdb_string_h) $(arm_tdep_h) + $(gdbcore_h) $(target_h) $(solib_h) $(solib_target_h) \ + $(gdb_string_h) $(arm_tdep_h) auxv.o: auxv.c $(defs_h) $(target_h) $(gdbtypes_h) $(command_h) \ $(inferior_h) $(valprint_h) $(gdb_assert_h) $(auxv_h) \ $(elf_common_h) @@ -2126,7 +2128,7 @@ i386bsd-tdep.o: i386bsd-tdep.c $(defs_h) $(arch_utils_h) $(frame_h) \ $(gdbcore_h) $(regcache_h) $(osabi_h) $(gdb_string_h) $(i386_tdep_h) i386-cygwin-tdep.o: i386-cygwin-tdep.c $(defs_h) $(osabi_h) $(gdb_string_h) \ $(i386_tdep_h) $(regset_h) $(gdb_obstack_h) $(xml_support_h) \ - $(gdbcore_h) $(i386_cygwin_tdep_h) + $(gdbcore_h) $(solib_h) $(solib_target_h) $(i386_cygwin_tdep_h) i386fbsd-nat.o: i386fbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ $(target_h) $(fbsd_nat_h) $(i386_tdep_h) $(i386bsd_nat_h) \ $(bsd_kvm_h) @@ -2654,7 +2656,7 @@ solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ $(exec_h) $(auxv_h) solib-target.o: solib-target.c $(defs_h) $(objfiles_h) $(solist_h) \ $(symtab_h) $(symfile_h) $(target_h) $(vec_h) $(xml_support_h) \ - $(gdb_string_h) + $(solib_target_h) $(gdb_string_h) sol-thread.o: sol-thread.c $(defs_h) $(gdbthread_h) $(target_h) \ $(inferior_h) $(gdb_stat_h) $(gdbcmd_h) $(gdbcore_h) $(regcache_h) \ $(solib_h) $(symfile_h) $(observer_h) $(gdb_string_h) $(gregset_h) diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c index dd7e3efed5d..f6108cf6f5f 100644 --- a/gdb/arm-wince-tdep.c +++ b/gdb/arm-wince-tdep.c @@ -22,6 +22,8 @@ #include "osabi.h" #include "gdbcore.h" #include "target.h" +#include "solib.h" +#include "solib-target.h" #include "gdb_string.h" @@ -92,6 +94,7 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_char_signed (gdbarch, 1); /* Shared library handling. */ + set_solib_ops (gdbarch, &solib_target_so_ops); set_gdbarch_skip_trampoline_code (gdbarch, arm_pe_skip_trampoline_code); /* Single stepping. */ diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c index 9aa2773743a..b3111944fce 100644 --- a/gdb/i386-cygwin-tdep.c +++ b/gdb/i386-cygwin-tdep.c @@ -26,6 +26,8 @@ #include "gdb_obstack.h" #include "xml-support.h" #include "gdbcore.h" +#include "solib.h" +#include "solib-target.h" /* Core file support. */ @@ -231,6 +233,8 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (i386_win32_gregset_reg_offset); tdep->sizeof_gregset = I386_WIN32_SIZEOF_GREGSET; + set_solib_ops (gdbarch, &solib_target_so_ops); + /* Core file support. */ set_gdbarch_regset_from_core_section (gdbarch, i386_win32_regset_from_core_section); diff --git a/gdb/solib-target.c b/gdb/solib-target.c index 680dc2d3ae7..924bc92d7b7 100644 --- a/gdb/solib-target.c +++ b/gdb/solib-target.c @@ -25,6 +25,7 @@ #include "symfile.h" #include "target.h" #include "vec.h" +#include "solib-target.h" #include "gdb_string.h" @@ -359,7 +360,7 @@ solib_target_in_dynsym_resolve_code (CORE_ADDR pc) return in_plt_section (pc, NULL); } -static struct target_so_ops solib_target_so_ops; +struct target_so_ops solib_target_so_ops; extern initialize_file_ftype _initialize_solib_target; /* -Wmissing-prototypes */ @@ -379,6 +380,4 @@ _initialize_solib_target (void) = solib_target_open_symbol_file_object; solib_target_so_ops.in_dynsym_resolve_code = solib_target_in_dynsym_resolve_code; - - current_target_so_ops = &solib_target_so_ops; } -- 2.30.2