Skip to content

Commit 29f9ebf

Browse files
author
Yao Qi
committed
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.
1 parent 64870a4 commit 29f9ebf

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

gdb/ChangeLog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2013-10-01 Yao Qi <[email protected]>
2+
3+
* arm-wince-tdep.c: Remove inclusion of "solib.h" and
4+
"solib-target.h". Include "windows-tdep.h".
5+
(arm_wince_init_abi): Call windows_init_abi. Remove call to
6+
set_solib_ops and set_gdbarch_has_dos_based_file_system.
7+
* configure.tgt (arm*-wince-pe | arm*-*-mingw32ce*): Append
8+
windows-tdep.o to gdb_target_obs.
9+
110
2013-10-01 Yao Qi <[email protected]>
211

312
* amd64-windows-tdep.c: Remove inclusion of "solib.h" and

gdb/arm-wince-tdep.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@
2222
#include "osabi.h"
2323
#include "gdbcore.h"
2424
#include "target.h"
25-
#include "solib.h"
26-
#include "solib-target.h"
2725
#include "frame.h"
2826

2927
#include "gdb_string.h"
3028

3129
#include "arm-tdep.h"
30+
#include "windows-tdep.h"
3231

3332
static const gdb_byte arm_wince_le_breakpoint[] = { 0x10, 0x00, 0x00, 0xe6 };
3433
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)
116115
{
117116
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
118117

118+
windows_init_abi (info, gdbarch);
119+
119120
tdep->arm_breakpoint = arm_wince_le_breakpoint;
120121
tdep->arm_breakpoint_size = sizeof (arm_wince_le_breakpoint);
121122
tdep->thumb_breakpoint = arm_wince_thumb_le_breakpoint;
@@ -131,18 +132,13 @@ arm_wince_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
131132
set_gdbarch_char_signed (gdbarch, 1);
132133

133134
/* Shared library handling. */
134-
set_solib_ops (gdbarch, &solib_target_so_ops);
135135
set_gdbarch_skip_trampoline_code (gdbarch, arm_pe_skip_trampoline_code);
136136

137137
/* Single stepping. */
138138
set_gdbarch_software_single_step (gdbarch, arm_software_single_step);
139139

140140
/* Skip call to __gccmain that gcc places in main. */
141141
set_gdbarch_skip_main_prologue (gdbarch, arm_wince_skip_main_prologue);
142-
143-
/* Canonical paths on this target look like `\Windows\coredll.dll',
144-
for example. */
145-
set_gdbarch_has_dos_based_file_system (gdbarch, 1);
146142
}
147143

148144
static enum gdb_osabi

gdb/configure.tgt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ am33_2.0*-*-linux*)
8383

8484
arm*-wince-pe | arm*-*-mingw32ce*)
8585
# Target: ARM based machine running Windows CE (win32)
86-
gdb_target_obs="arm-tdep.o arm-wince-tdep.o"
86+
gdb_target_obs="arm-tdep.o arm-wince-tdep.o windows-tdep.o"
8787
build_gdbserver=yes
8888
;;
8989
arm*-*-linux*)

0 commit comments

Comments
 (0)