gdb/

	* arm-wince-tdep.c: Remove inclusion of "solib.h" and
	"solib-target.h".  Include "windows-tdep.h".
	(arm_wince_init_abi): Call windows_init_abi.  Remove call to
	set_solib_ops and set_gdbarch_has_dos_based_file_system.
	* configure.tgt (arm*-wince-pe | arm*-*-mingw32ce*): Append
	windows-tdep.o to gdb_target_obs.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 676666c7391414de697b0c19d2a1188c5abe300b..9a77ebb79fc650f093bbbf6ee895dc38716def03 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+2013-10-01  Yao Qi  <yao@codesourcery.com>
+
+       * arm-wince-tdep.c: Remove inclusion of "solib.h" and
+       "solib-target.h".  Include "windows-tdep.h".
+       (arm_wince_init_abi): Call windows_init_abi.  Remove call to
+       set_solib_ops and set_gdbarch_has_dos_based_file_system.
+       * configure.tgt (arm*-wince-pe | arm*-*-mingw32ce*): Append
+       windows-tdep.o to gdb_target_obs.
+
 2013-10-01  Yao Qi  <yao@codesourcery.com>
 
        * amd64-windows-tdep.c: Remove inclusion of "solib.h" and

diff --git a/gdb/arm-wince-tdep.c b/gdb/arm-wince-tdep.c
index 61569e397f5f2ba5af4673b3b4c51cd37521fb38..0e888e06bedcc033a8d63f99984d71765a10ea54 100644 (file)
--- a/gdb/arm-wince-tdep.c
+++ b/gdb/arm-wince-tdep.c
@@ -22,13 +22,12 @@
 #include "osabi.h"
 #include "gdbcore.h"
 #include "target.h"
-#include "solib.h"
-#include "solib-target.h"
 #include "frame.h"
 
 #include "gdb_string.h"
 
 #include "arm-tdep.h"
+#include "windows-tdep.h"
 
 static const gdb_byte arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 };
 static const gdb_byte arm_wince_thumb_le_breakpoint[] = { 0xfe, 0xdf };
@@ -116,6 +115,8 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
+  windows_init_abi (info, gdbarch);
+
   tdep->arm_breakpoint = arm_wince_le_breakpoint;
   tdep->arm_breakpoint_size = sizeof (arm_wince_le_breakpoint);
   tdep->thumb_breakpoint = arm_wince_thumb_le_breakpoint;
@@ -131,7 +132,6 @@ 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.  */
@@ -139,10 +139,6 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
 
   /* Skip call to __gccmain that gcc places in main.  */
   set_gdbarch_skip_main_prologue (gdbarch, arm_wince_skip_main_prologue);
-
-  /* Canonical paths on this target look like `\Windows\coredll.dll',
-     for example.  */
-  set_gdbarch_has_dos_based_file_system (gdbarch, 1);
 }
 
 static enum gdb_osabi

diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 95c7217bd9bfd556bf17e46b6e7d794a699d01fb..ea0faf1b3132438242b2fa7d8d71cc29c953d661 100644 (file)
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -83,7 +83,7 @@ am33_2.0*-*-linux*)
 
 arm*-wince-pe | arm*-*-mingw32ce*)
        # Target: ARM based machine running Windows CE (win32)
-       gdb_target_obs="arm-tdep.o arm-wince-tdep.o"
+       gdb_target_obs="arm-tdep.o arm-wince-tdep.o windows-tdep.o"
        build_gdbserver=yes
        ;;
 arm*-*-linux*)