Merge remote-tracking branch 'origin/master' into amd-common

[deliverable/binutils-gdb.git] / gdb / breakpoint.c

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 5b734abf1c161b41001b428782a0f27d19f13edb..9e8291b4af0d2084731d801ec3990899ba633d13 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1,6 +1,7 @@
 /* Everything about breakpoints, for GDB.
 
    Copyright (C) 1986-2020 Free Software Foundation, Inc.
+   Copyright (C) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
 
    This file is part of GDB.
 
@@ -367,7 +368,10 @@ show_automatic_hardware_breakpoints (struct ui_file *file, int from_tty,
    breakpoints until the next resume, and removes them again when the
    target fully stops.  This is a bit safer in case GDB crashes while
    processing user input.  */
-static bool always_inserted_mode = false;
+/* FIXME: this is a temporary workaround to make sure waves created while
+   all known threads are stopped, and the gdb prompt is presented, do not
+   execute past the enabled breakpoints.  */
+static bool always_inserted_mode = true;
 
 static void
 show_always_inserted_mode (struct ui_file *file, int from_tty,
@@ -8511,7 +8515,9 @@ static void
 mention (struct breakpoint *b)
 {
   b->ops->print_mention (b);
-  current_uiout->text ("\n");
+  if (current_uiout->is_mi_like_p ())
+    return;
+  printf_filtered ("\n");
 }
 \f