X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmn10300-tdep.c;h=542ef407623377f98594659996d4ce43a401e6fe;hb=04180708eff91ddd3a9572bd4b517ccce5850db0;hp=16c0b392cad20b07c5f1c4fe82e05e28de891fe9;hpb=a97c97e8d7c818886f0f7beb3fd5dee0042b4a07;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 16c0b392ca..542ef40762 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -322,9 +322,9 @@ mn10300_write_pc (struct regcache *regcache, CORE_ADDR val)
    The Matsushita mn10x00 processors have single byte instructions
    so we need a single byte breakpoint.  Matsushita hasn't defined
    one, so we defined it ourselves.  */
-static gdb_byte breakpoint[] = {0xff};
+constexpr gdb_byte mn10300_break_insn[] = {0xff};
 
-GDBARCH_BREAKPOINT_MANIPULATION (mn10300, breakpoint)
+typedef BP_MANIPULATION (mn10300_break_insn) mn10300_breakpoint;
 
 /* Model the semantics of pushing a register onto the stack.  This
    is a helper function for mn10300_analyze_prologue, below.  */
@@ -1438,7 +1438,10 @@ mn10300_gdbarch_init (struct gdbarch_info info,
   /* Stack unwinding.  */
   set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
   /* Breakpoints.  */
-  SET_GDBARCH_BREAKPOINT_MANIPULATION (mn10300);
+  set_gdbarch_breakpoint_kind_from_pc (gdbarch,
+				       mn10300_breakpoint::kind_from_pc);
+  set_gdbarch_sw_breakpoint_from_kind (gdbarch,
+				       mn10300_breakpoint::bp_from_kind);
   /* decr_pc_after_break?  */
   /* Disassembly.  */
   set_gdbarch_print_insn (gdbarch, print_insn_mn10300);