Merge branch 'master' into merge-job

diff --git a/bfd/version.h b/bfd/version.h
index a39938344f5eb7fb529a62eb0eb1e3fba289155f..47fc27efcd0caf2aafebb805b3dfcb9938caafff 100644 (file)
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20200111
+#define BFD_VERSION_DATE 20200112
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ed2856c2466203cc85139e1564ae0d8663b29f12..980114919dfce9a236f0a98ced1006a623fa84c1 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,16 @@
+2020-01-12  Pedro Alves  <palves@redhat.com>
+
+       * bsd-kvm.c (bsd_kvm_target::close): Call exit_inferior_silent
+       directly for the current inferior instead of
+       discard_all_inferiors.
+       (discard_all_inferiors): Delete.
+
+2020-01-11  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-wingeneral.c (box_win): Check cli_styling.
+       * tui/tui-winsource.c (tui_source_window_base::refill): Use
+       deprecated_safe_get_selected_frame.
+
 2020-01-10  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
 
        * inferior.c (print_inferior): Switch inferior before printing it.

diff --git a/gdb/bsd-kvm.c b/gdb/bsd-kvm.c
index f864ba8b41ced3688fc922ef47ffbc571de3f0bb..b1b1fee5f4f4e8203ff88102e2f6dc37d33e1845 100644 (file)
--- a/gdb/bsd-kvm.c
+++ b/gdb/bsd-kvm.c
@@ -156,7 +156,7 @@ bsd_kvm_target::close ()
     }
 
   inferior_ptid = null_ptid;
-  discard_all_inferiors ();
+  exit_inferior_silent (current_inferior ());
 }
 
 static LONGEST

diff --git a/gdb/inferior.c b/gdb/inferior.c
index eb090dfde1a5850c6619b51440762e277e1a008f..c2e9da3d3d55b5a53c0d461f84eea806547857b9 100644 (file)
--- a/gdb/inferior.c
+++ b/gdb/inferior.c
@@ -260,13 +260,6 @@ inferior_appeared (struct inferior *inf, int pid)
   gdb::observers::inferior_appeared.notify (inf);
 }
 
-void
-discard_all_inferiors (void)
-{
-  for (inferior *inf : all_non_exited_inferiors ())
-    exit_inferior_silent (inf);
-}
-
 struct inferior *
 find_inferior_id (int num)
 {

diff --git a/gdb/tui/tui-wingeneral.c b/gdb/tui/tui-wingeneral.c
index dae4255ada2009e0cd3fdd68baffc20881d3782a..0a9fc5238d6121ca59a772bd8f5cb656a4774310 100644 (file)
--- a/gdb/tui/tui-wingeneral.c
+++ b/gdb/tui/tui-wingeneral.c
@@ -55,9 +55,10 @@ box_win (struct tui_win_info *win_info,
 
   /* tui_apply_style resets the style entirely, so be sure to call it
      before applying ATTRS.  */
-  tui_apply_style (win, (highlight_flag
-                        ? tui_active_border_style.style ()
-                        : tui_border_style.style ()));
+  if (cli_styling)
+    tui_apply_style (win, (highlight_flag
+                          ? tui_active_border_style.style ()
+                          : tui_border_style.style ()));
   wattron (win, attrs);
 #ifdef HAVE_WBORDER
   wborder (win, tui_border_vline, tui_border_vline,

diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 69070115ec69ca99ef3d653d368c3fcdeb454e8d..fbee2e3e1813bc8acbcc393f9a704bb1d5230406 100644 (file)
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -352,7 +352,11 @@ tui_source_window_base::refill ()
     {
       sal = get_current_source_symtab_and_line ();
       if (sal.symtab == NULL)
-       sal = find_pc_line (get_frame_pc (get_selected_frame (NULL)), 0);
+       {
+         struct frame_info *fi = deprecated_safe_get_selected_frame ();
+         if (fi != nullptr)
+           sal = find_pc_line (get_frame_pc (fi), 0);
+       }
     }
 
   if (sal.pspace == nullptr)