3 files changed, 4 insertions, 28 deletions
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 2b9883c..01786c3 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -2699,31 +2699,13 @@ mi_cmd_trace_frame_collected (const char *command, char **argv, int argc)
   }
 }
 
-/* Whether to use the fixed output when printing information about a
-   multi-location breakpoint (see PR 9659).  */
-
-static bool fix_multi_location_breakpoint_output = false;
-
 /* See mi/mi-main.h.  */
 
 void
 mi_cmd_fix_multi_location_breakpoint_output (const char *command, char **argv,
 					     int argc)
 {
-  fix_multi_location_breakpoint_output = true;
-}
-
-/* See mi/mi-main.h.  */
-
-bool
-mi_multi_location_breakpoint_output_fixed (ui_out *uiout)
-{
-  mi_ui_out *mi_uiout = dynamic_cast<mi_ui_out *> (uiout);
-
-  if (mi_uiout == nullptr)
-    return false;
-
-  return mi_uiout->version () >= 3 || fix_multi_location_breakpoint_output;
+  fix_multi_location_breakpoint_output_globally = true;
 }
 
 void
diff --git a/gdb/mi/mi-main.h b/gdb/mi/mi-main.h
index 72c4e59..1986228 100644
--- a/gdb/mi/mi-main.h
+++ b/gdb/mi/mi-main.h
@@ -59,12 +59,4 @@ extern struct mi_suppress_notification mi_suppress_notification;
 extern void mi_cmd_fix_multi_location_breakpoint_output (const char *command,
 							 char **argv, int argc);
 
-/* Return whether -break-list, -break-insert, =breakpoint-created and
-   =breakpoint-modified should use the "fixed" output format (see PR
-   9659).
-
-   Return false if UIOUT is not an MI UI.  */
-
-extern bool mi_multi_location_breakpoint_output_fixed (ui_out *uiout);
-
 #endif /* MI_MI_MAIN_H */
diff --git a/gdb/mi/mi-out.c b/gdb/mi/mi-out.c
index e485bee..d8bee0f 100644
--- a/gdb/mi/mi-out.c
+++ b/gdb/mi/mi-out.c
@@ -280,7 +280,9 @@ mi_ui_out::version ()
 /* Constructor for an `mi_out_data' object.  */
 
 mi_ui_out::mi_ui_out (int mi_version)
-: m_suppress_field_separator (false),
+: ui_out (mi_version >= 3
+	  ? fix_multi_location_breakpoint_output : (ui_out_flag) 0),
+  m_suppress_field_separator (false),
   m_suppress_output (false),
   m_mi_version (mi_version)
 {