PR22348, conflicting global vars in crx and cr16

[deliverable/binutils-gdb.git] / gdb / microblaze-linux-tdep.c

diff --git a/gdb/microblaze-linux-tdep.c b/gdb/microblaze-linux-tdep.c
index 33be62d282e4b1193df0e0dcc79c1e99549f623e..285eefe33fb78a98111360dcd28c5f1697f38fea 100644 (file)
--- a/gdb/microblaze-linux-tdep.c
+++ b/gdb/microblaze-linux-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Xilinx MicroBlaze.
 
-   Copyright 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 2009-2017 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -41,7 +41,7 @@ static int
 microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch, 
                                           struct bp_target_info *bp_tgt)
 {
-  CORE_ADDR addr = bp_tgt->placed_address;
+  CORE_ADDR addr = bp_tgt->reqstd_address;
   const gdb_byte *bp;
   int val;
   int bplen;
@@ -49,8 +49,6 @@ microblaze_linux_memory_remove_breakpoint (struct gdbarch *gdbarch,
 
   /* Determine appropriate breakpoint contents and size for this address.  */
   bp = gdbarch_breakpoint_from_pc (gdbarch, &addr, &bplen);
-  if (bp == NULL)
-    error (_("Software breakpoints not implemented for this target."));
 
   val = target_read_memory (addr, old_contents, bplen);
 
@@ -137,9 +135,6 @@ microblaze_linux_init_abi (struct gdbarch_info info,
                                &microblaze_linux_sighandler_tramp_frame);
 }
 
-/* -Wmissing-prototypes */
-extern initialize_file_ftype _initialize_microblaze_linux_tdep;
-
 void
 _initialize_microblaze_linux_tdep (void)
 {