From 64870a42a92fd40e6b94d5a0632fbe1431a68d42 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Tue, 1 Oct 2013 13:17:57 +0000 Subject: gdb/ * amd64-windows-tdep.c: Remove inclusion of "solib.h" and "solib-target.h". (amd64_windows_init_abi): Don't call set_solib_ops and set_gdbarch_iterate_over_objfiles_in_search_order. Call windows_init_abi instead. * i386-cygwin-tdep.c: Remove inclusion of "solib.h" and "solib-target.h". (i386_cygwin_init_abi): Don't call set_solib_ops, set_gdbarch_has_dos_based_file_system and set_gdbarch_iterate_over_objfiles_in_search_order. Call windows_init_abi instead. * windows-tdep.c: Include "solib.h" and "solib-target.h". (windows_init_abi): New function. (windows_iterate_over_objfiles_in_search_order): Make it static. * windows-tdep.h (windows_init_abi): Declare. (windows_iterate_over_objfiles_in_search_order): Remove declaration. --- gdb/i386-cygwin-tdep.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gdb/i386-cygwin-tdep.c') diff --git a/gdb/i386-cygwin-tdep.c b/gdb/i386-cygwin-tdep.c index a3e4e7c..6533d1c 100644 --- a/gdb/i386-cygwin-tdep.c +++ b/gdb/i386-cygwin-tdep.c @@ -26,8 +26,6 @@ #include "gdb_obstack.h" #include "xml-support.h" #include "gdbcore.h" -#include "solib.h" -#include "solib-target.h" #include "inferior.h" /* Core file support. */ @@ -233,6 +231,8 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + windows_init_abi (info, gdbarch); + set_gdbarch_skip_trampoline_code (gdbarch, i386_cygwin_skip_trampoline_code); set_gdbarch_skip_main_prologue (gdbarch, i386_skip_main_prologue); @@ -243,8 +243,6 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->gregset_num_regs = ARRAY_SIZE (i386_windows_gregset_reg_offset); tdep->sizeof_gregset = I386_WINDOWS_SIZEOF_GREGSET; - set_solib_ops (gdbarch, &solib_target_so_ops); - /* Core file support. */ set_gdbarch_regset_from_core_section (gdbarch, i386_windows_regset_from_core_section); @@ -253,13 +251,6 @@ i386_cygwin_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_core_pid_to_str (gdbarch, i386_windows_core_pid_to_str); set_gdbarch_auto_wide_charset (gdbarch, i386_cygwin_auto_wide_charset); - - /* Canonical paths on this target look like - `c:\Program Files\Foo App\mydll.dll', for example. */ - set_gdbarch_has_dos_based_file_system (gdbarch, 1); - - set_gdbarch_iterate_over_objfiles_in_search_order - (gdbarch, windows_iterate_over_objfiles_in_search_order); } static enum gdb_osabi -- cgit v1.1