diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/bfd/version.h ./bfd/version.h
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/bfd/version.h	2019-12-09 01:49:28.000000000 +0000
+++ ./bfd/version.h	2019-12-10 01:49:24.000000000 +0000
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20191209
+#define BFD_VERSION_DATE 20191210
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/djunpack.bat ./djunpack.bat
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/djunpack.bat	2019-12-09 01:53:33.000000000 +0000
+++ ./djunpack.bat	2019-12-10 01:53:37.000000000 +0000
@@ -17,8 +17,8 @@ Rem
 Rem The following 2 lines need to be changed with each new GDB release, to
 Rem be identical to the name of the top-level directory where the GDB
 Rem distribution unpacks itself.
-set GDBVER=$package-9.0.50.20191209
-if "%GDBVER%"=="$package-9.0.50.20191209" GoTo EnvOk
+set GDBVER=$package-9.0.50.20191210
+if "%GDBVER%"=="$package-9.0.50.20191210" GoTo EnvOk
 Rem If their environment space is too small, re-exec with a larger one
 command.com /e:4096 /c %0 %1
 GoTo End
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/breakpoint.c ./gdb/breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/breakpoint.c	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/breakpoint.c	2019-12-10 01:49:26.000000000 +0000
@@ -246,6 +246,9 @@ struct breakpoint_ops bkpt_breakpoint_op
 /* Breakpoints set on probes.  */
 static struct breakpoint_ops bkpt_probe_breakpoint_ops;
 
+/* Tracepoints set on probes.  */
+static struct breakpoint_ops tracepoint_probe_breakpoint_ops;
+
 /* Dynamic printf class type.  */
 struct breakpoint_ops dprintf_breakpoint_ops;
 
@@ -9163,6 +9166,41 @@ decode_static_tracepoint_spec (const cha
   return sals;
 }
 
+/* Returns the breakpoint ops appropriate for use with with LOCATION_TYPE and
+   according to IS_TRACEPOINT.  */
+
+static const struct breakpoint_ops *
+breakpoint_ops_for_event_location_type (enum event_location_type location_type,
+					bool is_tracepoint)
+{
+  if (is_tracepoint)
+    {
+      if (location_type == PROBE_LOCATION)
+	return &tracepoint_probe_breakpoint_ops;
+      else
+	return &tracepoint_breakpoint_ops;
+    }
+  else
+    {
+      if (location_type == PROBE_LOCATION)
+	return &bkpt_probe_breakpoint_ops;
+      else
+	return &bkpt_breakpoint_ops;
+    }
+}
+
+/* See breakpoint.h.  */
+
+const struct breakpoint_ops *
+breakpoint_ops_for_event_location (const struct event_location *location,
+				   bool is_tracepoint)
+{
+  if (location != nullptr)
+    return breakpoint_ops_for_event_location_type
+      (event_location_type (location), is_tracepoint);
+  return is_tracepoint ? &tracepoint_breakpoint_ops : &bkpt_breakpoint_ops;
+}
+
 /* See breakpoint.h.  */
 
 int
@@ -9344,16 +9382,10 @@ break_command_1 (const char *arg, int fl
   enum bptype type_wanted = (flag & BP_HARDWAREFLAG
 			     ? bp_hardware_breakpoint
 			     : bp_breakpoint);
-  struct breakpoint_ops *ops;
 
   event_location_up location = string_to_event_location (&arg, current_language);
-
-  /* Matching breakpoints on probes.  */
-  if (location != NULL
-      && event_location_type (location.get ()) == PROBE_LOCATION)
-    ops = &bkpt_probe_breakpoint_ops;
-  else
-    ops = &bkpt_breakpoint_ops;
+  const struct breakpoint_ops *ops = breakpoint_ops_for_event_location
+    (location.get (), false /* is_tracepoint */);
 
   create_breakpoint (get_current_arch (),
 		     location.get (),
@@ -12802,8 +12834,7 @@ tracepoint_decode_location (struct break
 
 struct breakpoint_ops tracepoint_breakpoint_ops;
 
-/* The breakpoint_ops structure to be use on tracepoints placed in a
-   static probe.  */
+/* Virtual table for tracepoints on static probes.  */
 
 static void
 tracepoint_probe_create_sals_from_location
@@ -12824,8 +12855,6 @@ tracepoint_probe_decode_location (struct
   return bkpt_probe_decode_location (b, location, search_pspace);
 }
 
-static struct breakpoint_ops tracepoint_probe_breakpoint_ops;
-
 /* Dprintf breakpoint_ops methods.  */
 
 static void
@@ -14467,15 +14496,10 @@ set_tracepoint_count (int num)
 static void
 trace_command (const char *arg, int from_tty)
 {
-  struct breakpoint_ops *ops;
-
   event_location_up location = string_to_event_location (&arg,
 							 current_language);
-  if (location != NULL
-      && event_location_type (location.get ()) == PROBE_LOCATION)
-    ops = &tracepoint_probe_breakpoint_ops;
-  else
-    ops = &tracepoint_breakpoint_ops;
+  const struct breakpoint_ops *ops = breakpoint_ops_for_event_location
+    (location.get (), true /* is_tracepoint */);
 
   create_breakpoint (get_current_arch (),
 		     location.get (),
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/breakpoint.h ./gdb/breakpoint.h
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/breakpoint.h	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/breakpoint.h	2019-12-10 01:49:26.000000000 +0000
@@ -1352,6 +1352,15 @@ extern void init_catchpoint (struct brea
 extern void install_breakpoint (int internal, std::unique_ptr<breakpoint> &&b,
 				int update_gll);
 
+/* Returns the breakpoint ops appropriate for use with with LOCATION and
+   according to IS_TRACEPOINT.  Use this to ensure, for example, that you pass
+   the correct ops to create_breakpoint for probe locations.  If LOCATION is
+   NULL, returns bkpt_breakpoint_ops (or tracepoint_breakpoint_ops, if
+   IS_TRACEPOINT is true).  */
+
+extern const struct breakpoint_ops *breakpoint_ops_for_event_location
+  (const struct event_location *location, bool is_tracepoint);
+
 /* Flags that can be passed down to create_breakpoint, etc., to affect
    breakpoint creation in several ways.  */
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/ChangeLog ./gdb/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/ChangeLog	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/ChangeLog	2019-12-10 01:49:26.000000000 +0000
@@ -1,3 +1,29 @@
+2019-12-10  George Barrett  <bob@bob131.so>
+
+	Fix scripted probe breakpoints.
+	* breakpoint.c (tracepoint_probe_breakpoint_ops): Move
+	declaration forward.
+	(breakpoint_ops_for_event_location_type)
+	(breakpoint_ops_for_event_location): Add function definitions.
+	(break_command_1, trace_command): Use
+	breakpoint_ops_for_event_location.
+	* breakpoint.h (breakpoint_ops_for_event_location): Add function
+	declarations.
+	* guile/scm-breakpoint.c (gdbscm_register_breakpoint_x): Use
+	breakpoint_ops_for_event_location.
+	* python/py-breakpoint.c (bppy_init): Use
+	breakpoint_ops_for_event_location.
+
+2019-12-09  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	* gdbtypes.c (rank_one_type): Return INCOMPATIBLE_TYPE_BADNESS
+	when ranking an lvalue argument for an rvalue parameter.
+
+2019-12-08  Wataru Ashihara  <wataash@wataash.com>
+
+	* darwin-nat.c (darwin_nat_target::create_inferior): Fix
+	template argument for scoped_restore_tmpl from bool to int.
+
 2019-12-07  Keith Seitz  <keiths@redhat.com>
 
 	* build-id.c (build_id_bfd_get): Permit bfd_core, too.
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/darwin-nat.c ./gdb/darwin-nat.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/darwin-nat.c	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/darwin-nat.c	2019-12-10 01:49:26.000000000 +0000
@@ -1985,7 +1985,7 @@ darwin_nat_target::create_inferior (cons
 				    const std::string &allargs,
 				    char **env, int from_tty)
 {
-  gdb::optional<scoped_restore_tmpl<int>> restore_startup_with_shell;
+  gdb::optional<scoped_restore_tmpl<bool>> restore_startup_with_shell;
 
   if (startup_with_shell && may_have_sip ())
     {
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gcore.1 ./gdb/doc/gcore.1
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gcore.1	2019-12-09 01:53:25.000000000 +0000
+++ ./gdb/doc/gcore.1	2019-12-10 01:53:31.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GCORE 1"
-.TH GCORE 1 "2019-12-09" "gdb-9.0.50.20191209-git" "GNU Development Tools"
+.TH GCORE 1 "2019-12-10" "gdb-9.0.50.20191210-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.1 ./gdb/doc/gdb.1
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.1	2019-12-09 01:53:25.000000000 +0000
+++ ./gdb/doc/gdb.1	2019-12-10 01:53:30.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB 1"
-.TH GDB 1 "2019-12-09" "gdb-9.0.50.20191209-git" "GNU Development Tools"
+.TH GDB 1 "2019-12-10" "gdb-9.0.50.20191210-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb-add-index.1 ./gdb/doc/gdb-add-index.1
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb-add-index.1	2019-12-09 01:53:25.000000000 +0000
+++ ./gdb/doc/gdb-add-index.1	2019-12-10 01:53:31.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDB-ADD-INDEX 1"
-.TH GDB-ADD-INDEX 1 "2019-12-09" "gdb-9.0.50.20191209-git" "GNU Development Tools"
+.TH GDB-ADD-INDEX 1 "2019-12-10" "gdb-9.0.50.20191210-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info ./gdb/doc/gdb.info
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info	2019-12-09 01:53:22.000000000 +0000
+++ ./gdb/doc/gdb.info	2019-12-10 01:53:28.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-1 ./gdb/doc/gdb.info-1
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-1	2019-12-09 01:53:09.000000000 +0000
+++ ./gdb/doc/gdb.info-1	2019-12-10 01:53:15.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -44,7 +44,7 @@ Debugging with GDB
 
 This file describes GDB, the GNU symbolic debugger.
 
-   This is the Tenth Edition, for GDB (GDB) Version 9.0.50.20191209-git.
+   This is the Tenth Edition, for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -507,7 +507,7 @@ Let us use GDB to try to see what is goi
      There is absolutely no warranty for GDB; type "show warranty"
       for details.
 
-     GDB 9.0.50.20191209-git, Copyright 1999 Free Software Foundation, Inc...
+     GDB 9.0.50.20191210-git, Copyright 1999 Free Software Foundation, Inc...
      (gdb)
 
 GDB reads only enough symbol data to know where to find the rest when
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-2 ./gdb/doc/gdb.info-2
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-2	2019-12-09 01:53:11.000000000 +0000
+++ ./gdb/doc/gdb.info-2	2019-12-10 01:53:17.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-3 ./gdb/doc/gdb.info-3
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-3	2019-12-09 01:53:13.000000000 +0000
+++ ./gdb/doc/gdb.info-3	2019-12-10 01:53:19.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-4 ./gdb/doc/gdb.info-4
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-4	2019-12-09 01:53:15.000000000 +0000
+++ ./gdb/doc/gdb.info-4	2019-12-10 01:53:21.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-5 ./gdb/doc/gdb.info-5
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-5	2019-12-09 01:53:17.000000000 +0000
+++ ./gdb/doc/gdb.info-5	2019-12-10 01:53:23.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-6 ./gdb/doc/gdb.info-6
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-6	2019-12-09 01:53:19.000000000 +0000
+++ ./gdb/doc/gdb.info-6	2019-12-10 01:53:25.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
@@ -4704,7 +4704,7 @@ and TeX (or 'texi2roff') to typeset the 
 
    GDB includes an already formatted copy of the on-line Info version of
 this manual in the 'gdb' subdirectory.  The main Info file is
-'gdb-9.0.50.20191209-git/gdb/gdb.info', and it refers to subordinate
+'gdb-9.0.50.20191210-git/gdb/gdb.info', and it refers to subordinate
 files matching 'gdb.info*' in the same directory.  If necessary, you can
 print out these files, or read them with any editor; but they are easier
 to read using the 'info' subsystem in GNU Emacs or the standalone 'info'
@@ -4714,8 +4714,8 @@ program, available as part of the GNU Te
 Info formatting programs, such as 'texinfo-format-buffer' or 'makeinfo'.
 
    If you have 'makeinfo' installed, and are in the top level GDB source
-directory ('gdb-9.0.50.20191209-git', in the case of version
-9.0.50.20191209-git), you can make the Info file by typing:
+directory ('gdb-9.0.50.20191210-git', in the case of version
+9.0.50.20191210-git), you can make the Info file by typing:
 
      cd gdb
      make gdb.info
@@ -4740,7 +4740,7 @@ On its own, TeX cannot either read or ty
 
    If you have TeX and a DVI printer program installed, you can typeset
 and print this manual.  First switch to the 'gdb' subdirectory of the
-main source directory (for example, to 'gdb-9.0.50.20191209-git/gdb')
+main source directory (for example, to 'gdb-9.0.50.20191210-git/gdb')
 and type:
 
      make gdb.dvi
@@ -4749,8 +4749,8 @@ and type:
 
    ---------- Footnotes ----------
 
-   (1) In 'gdb-9.0.50.20191209-git/gdb/refcard.ps' of the version
-9.0.50.20191209-git release.
+   (1) In 'gdb-9.0.50.20191210-git/gdb/refcard.ps' of the version
+9.0.50.20191210-git release.
 
 
 File: gdb.info,  Node: Installing GDB,  Next: Maintenance Commands,  Prev: Formatting Documentation,  Up: Top
@@ -4901,35 +4901,35 @@ preparing GDB for installation; you can 
 a single directory, whose name is usually composed by appending the
 version number to 'gdb'.
 
-   For example, the GDB version 9.0.50.20191209-git distribution is in
-the 'gdb-9.0.50.20191209-git' directory.  That directory contains:
+   For example, the GDB version 9.0.50.20191210-git distribution is in
+the 'gdb-9.0.50.20191210-git' directory.  That directory contains:
 
-'gdb-9.0.50.20191209-git/configure (and supporting files)'
+'gdb-9.0.50.20191210-git/configure (and supporting files)'
      script for configuring GDB and all its supporting libraries
 
-'gdb-9.0.50.20191209-git/gdb'
+'gdb-9.0.50.20191210-git/gdb'
      the source specific to GDB itself
 
-'gdb-9.0.50.20191209-git/bfd'
+'gdb-9.0.50.20191210-git/bfd'
      source for the Binary File Descriptor library
 
-'gdb-9.0.50.20191209-git/include'
+'gdb-9.0.50.20191210-git/include'
      GNU include files
 
-'gdb-9.0.50.20191209-git/libiberty'
+'gdb-9.0.50.20191210-git/libiberty'
      source for the '-liberty' free software library
 
-'gdb-9.0.50.20191209-git/opcodes'
+'gdb-9.0.50.20191210-git/opcodes'
      source for the library of opcode tables and disassemblers
 
-'gdb-9.0.50.20191209-git/readline'
+'gdb-9.0.50.20191210-git/readline'
      source for the GNU command-line interface
 
    There may be other subdirectories as well.
 
    The simplest way to configure and build GDB is to run 'configure'
 from the 'gdb-VERSION-NUMBER' source directory, which in this example is
-the 'gdb-9.0.50.20191209-git' directory.
+the 'gdb-9.0.50.20191210-git' directory.
 
    First switch to the 'gdb-VERSION-NUMBER' source directory if you are
 not already in it; then run 'configure'.  Pass the identifier for the
@@ -4937,7 +4937,7 @@ platform on which GDB will run as an arg
 
    For example:
 
-     cd gdb-9.0.50.20191209-git
+     cd gdb-9.0.50.20191210-git
      ./configure
      make
 
@@ -4985,13 +4985,13 @@ to specify a path to find 'configure' it
 directory.  If the path to 'configure' would be the same as the argument
 to '--srcdir', you can leave out the '--srcdir' option; it is assumed.)
 
-   For example, with version 9.0.50.20191209-git, you can build GDB in a
+   For example, with version 9.0.50.20191210-git, you can build GDB in a
 separate directory for a Sun 4 like this:
 
-     cd gdb-9.0.50.20191209-git
+     cd gdb-9.0.50.20191210-git
      mkdir ../gdb-sun4
      cd ../gdb-sun4
-     ../gdb-9.0.50.20191209-git/configure
+     ../gdb-9.0.50.20191210-git/configure
      make
 
    When 'configure' builds a configuration using a remote source
@@ -5002,7 +5002,7 @@ the example, you'd find the Sun 4 librar
 
    Make sure that your path to the 'configure' script has just one
 instance of 'gdb' in it.  If your path to 'configure' looks like
-'../gdb-9.0.50.20191209-git/gdb/configure', you are configuring only one
+'../gdb-9.0.50.20191210-git/gdb/configure', you are configuring only one
 subdirectory of GDB, not the whole package.  This leads to build errors
 about missing include files such as 'bfd/bfd.h'.
 
@@ -5018,8 +5018,8 @@ a configured directory--whatever directo
 
    The 'Makefile' that 'configure' generates in each source directory
 also runs recursively.  If you type 'make' in a source directory such as
-'gdb-9.0.50.20191209-git' (or in a separate configured directory
-configured with '--srcdir=DIRNAME/gdb-9.0.50.20191209-git'), you will
+'gdb-9.0.50.20191210-git' (or in a separate configured directory
+configured with '--srcdir=DIRNAME/gdb-9.0.50.20191210-git'), you will
 build all the required libraries, and then build GDB.
 
    When you have multiple hosts or targets configured in separate
@@ -5064,7 +5064,7 @@ you can use it to test your guesses on a
      Invalid configuration `i986v': machine `i986v' not recognized
 
 'config.sub' is also distributed in the GDB source directory
-('gdb-9.0.50.20191209-git', for version 9.0.50.20191209-git).
+('gdb-9.0.50.20191210-git', for version 9.0.50.20191210-git).
 
 
 File: gdb.info,  Node: Configure Options,  Next: System-wide configuration,  Prev: Config Names,  Up: Installing GDB
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-7 ./gdb/doc/gdb.info-7
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-7	2019-12-09 01:53:21.000000000 +0000
+++ ./gdb/doc/gdb.info-7	2019-12-10 01:53:27.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-8 ./gdb/doc/gdb.info-8
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdb.info-8	2019-12-09 01:53:22.000000000 +0000
+++ ./gdb/doc/gdb.info-8	2019-12-10 01:53:28.000000000 +0000
@@ -21,7 +21,7 @@ END-INFO-DIR-ENTRY
    This file documents the GNU debugger GDB.
 
    This is the Tenth Edition, of 'Debugging with GDB: the GNU
-Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191209-git.
+Source-Level Debugger' for GDB (GDB) Version 9.0.50.20191210-git.
 
    Copyright (C) 1988-2019 Free Software Foundation, Inc.
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdbinit.5 ./gdb/doc/gdbinit.5
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdbinit.5	2019-12-09 01:53:26.000000000 +0000
+++ ./gdb/doc/gdbinit.5	2019-12-10 01:53:31.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBINIT 5"
-.TH GDBINIT 5 "2019-12-09" "gdb-9.0.50.20191209-git" "GNU Development Tools"
+.TH GDBINIT 5 "2019-12-10" "gdb-9.0.50.20191210-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdbserver.1 ./gdb/doc/gdbserver.1
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/doc/gdbserver.1	2019-12-09 01:53:25.000000000 +0000
+++ ./gdb/doc/gdbserver.1	2019-12-10 01:53:31.000000000 +0000
@@ -124,7 +124,7 @@
 .\" ========================================================================
 .\"
 .IX Title "GDBSERVER 1"
-.TH GDBSERVER 1 "2019-12-09" "gdb-9.0.50.20191209-git" "GNU Development Tools"
+.TH GDBSERVER 1 "2019-12-10" "gdb-9.0.50.20191210-git" "GNU Development Tools"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/gdbtypes.c ./gdb/gdbtypes.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/gdbtypes.c	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/gdbtypes.c	2019-12-10 01:49:26.000000000 +0000
@@ -4303,12 +4303,9 @@ rank_one_type (struct type *parm, struct
 	}
       else
 	{
-	  /* Lvalues should prefer lvalue overloads.  */
+	  /* It's illegal to pass an lvalue as an rvalue.  */
 	  if (TYPE_CODE (parm) == TYPE_CODE_RVALUE_REF)
-	    {
-	      rank.subrank = REFERENCE_CONVERSION_RVALUE;
-	      return sum_ranks (rank, REFERENCE_CONVERSION_BADNESS);
-	    }
+	    return INCOMPATIBLE_TYPE_BADNESS;
 	}
     }
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/guile/scm-breakpoint.c ./gdb/guile/scm-breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/guile/scm-breakpoint.c	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/guile/scm-breakpoint.c	2019-12-10 01:49:26.000000000 +0000
@@ -437,13 +437,15 @@ gdbscm_register_breakpoint_x (SCM self)
 	{
 	case bp_breakpoint:
 	  {
+	    const breakpoint_ops *ops =
+	      breakpoint_ops_for_event_location (eloc.get (), false);
 	    create_breakpoint (get_current_arch (),
 			       eloc.get (), NULL, -1, NULL,
 			       0,
 			       0, bp_breakpoint,
 			       0,
 			       AUTO_BOOLEAN_TRUE,
-			       &bkpt_breakpoint_ops,
+			       ops,
 			       0, 1, internal, 0);
 	    break;
 	  }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/po/gdb.pot ./gdb/po/gdb.pot
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/po/gdb.pot	2019-12-09 01:52:58.000000000 +0000
+++ ./gdb/po/gdb.pot	2019-12-10 01:53:04.000000000 +0000
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-09 01:52+0000\n"
+"POT-Creation-Date: 2019-12-10 01:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -849,7 +849,7 @@ msgstr ""
 msgid "Condition missing after `if' keyword"
 msgstr ""
 
-#: ada-lang.c:12777 breakpoint.c:873 breakpoint.c:887
+#: ada-lang.c:12777 breakpoint.c:876 breakpoint.c:890
 msgid "Junk at end of expression"
 msgstr ""
 
@@ -872,8 +872,8 @@ msgstr ""
 msgid "condition missing after `if' keyword"
 msgstr ""
 
-#: ada-lang.c:13090 break-catch-throw.c:440 breakpoint.c:9128
-#: breakpoint.c:10993 breakpoint.c:11125 breakpoint.c:11169 breakpoint.c:14771
+#: ada-lang.c:13090 break-catch-throw.c:440 breakpoint.c:9131
+#: breakpoint.c:11025 breakpoint.c:11157 breakpoint.c:11201 breakpoint.c:14795
 msgid "Junk at end of arguments."
 msgstr ""
 
@@ -2999,11 +2999,11 @@ msgstr ""
 msgid "Must start with a format string."
 msgstr ""
 
-#: ax-gdb.c:2705 breakpoint.c:2225 printcmd.c:2548
+#: ax-gdb.c:2705 breakpoint.c:2228 printcmd.c:2548
 msgid "Bad format string, non-terminated '\"'."
 msgstr ""
 
-#: ax-gdb.c:2710 breakpoint.c:2230 printcmd.c:2553
+#: ax-gdb.c:2710 breakpoint.c:2233 printcmd.c:2553
 msgid "Invalid argument syntax"
 msgstr ""
 
@@ -3406,523 +3406,523 @@ msgstr ""
 msgid "Catch an exception, when rethrown."
 msgstr ""
 
-#: breakpoint.c:324
+#: breakpoint.c:327
 #, possible-c-format
 msgid "Debugger's willingness to use watchpoint hardware is %s.\n"
 msgstr ""
 
-#: breakpoint.c:340
+#: breakpoint.c:343
 #, possible-c-format
 msgid "Debugger's behavior regarding pending breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:356
+#: breakpoint.c:359
 #, possible-c-format
 msgid "Automatic usage of hardware breakpoints is %s.\n"
 msgstr ""
 
-#: breakpoint.c:373
+#: breakpoint.c:376
 #, possible-c-format
 msgid "Always inserted breakpoint mode is %s.\n"
 msgstr ""
 
-#: breakpoint.c:709
+#: breakpoint.c:712
 msgid ""
 "Target does not support breakpoint condition evaluation.\n"
 "Using host evaluation mode instead."
 msgstr ""
 
-#: breakpoint.c:765
+#: breakpoint.c:768
 #, possible-c-format
 msgid "Breakpoint condition evaluation mode is %s (currently %s).\n"
 msgstr ""
 
-#: breakpoint.c:770
+#: breakpoint.c:773
 #, possible-c-format
 msgid "Breakpoint condition evaluation mode is %s.\n"
 msgstr ""
 
-#: breakpoint.c:854
+#: breakpoint.c:857
 #, possible-c-format
 msgid "Breakpoint %d now unconditional.\n"
 msgstr ""
 
-#: breakpoint.c:951
+#: breakpoint.c:954
 msgid "breakpoint number"
 msgstr ""
 
-#: breakpoint.c:956
+#: breakpoint.c:959
 #, possible-c-format
 msgid "Bad breakpoint argument: '%s'"
 msgstr ""
 
-#: breakpoint.c:969 guile/scm-breakpoint.c:945 python/py-breakpoint.c:1173
+#: breakpoint.c:972 guile/scm-breakpoint.c:947 python/py-breakpoint.c:1176
 #, possible-c-format
 msgid ""
 "Only one stop condition allowed.  There is currently a %s stop condition "
 "defined for this breakpoint."
 msgstr ""
 
-#: breakpoint.c:981 breakpoint.c:13833
+#: breakpoint.c:984 breakpoint.c:13862
 #, possible-c-format
 msgid "No breakpoint number %d."
 msgstr ""
 
-#: breakpoint.c:996
+#: breakpoint.c:999
 msgid "The 'while-stepping' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:1006
+#: breakpoint.c:1009
 msgid "The 'collect' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:1009
+#: breakpoint.c:1012
 msgid "The 'teval' command can only be used for tracepoints"
 msgstr ""
 
-#: breakpoint.c:1094
+#: breakpoint.c:1097
 msgid "The 'while-stepping' command cannot be used for fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:1097
+#: breakpoint.c:1100
 msgid "The 'while-stepping' command cannot be used for static tracepoint"
 msgstr ""
 
-#: breakpoint.c:1101
+#: breakpoint.c:1104
 msgid "The 'while-stepping' command can be used only once"
 msgstr ""
 
-#: breakpoint.c:1118
+#: breakpoint.c:1121
 msgid "The 'while-stepping' command cannot be nested"
 msgstr ""
 
-#: breakpoint.c:1235
+#: breakpoint.c:1238
 #, possible-c-format
 msgid "Type commands for breakpoint(s) %s, one per line."
 msgstr ""
 
-#: breakpoint.c:1473
+#: breakpoint.c:1476
 #, possible-c-format
 msgid "reading through apparently deleted breakpoint #%d?"
 msgstr ""
 
-#: breakpoint.c:1755 breakpoint.c:1936
+#: breakpoint.c:1758 breakpoint.c:1939
 msgid ""
 "Can't set read/access watchpoint when hardware watchpoints are disabled."
 msgstr ""
 
-#: breakpoint.c:1915
+#: breakpoint.c:1918
 msgid "Target does not support this type of hardware watchpoint."
 msgstr ""
 
-#: breakpoint.c:1918
+#: breakpoint.c:1921
 msgid "There are not enough available hardware resources for this watchpoint."
 msgstr ""
 
-#: breakpoint.c:1939
+#: breakpoint.c:1942
 msgid "Expression cannot be implemented with read/access watchpoint."
 msgstr ""
 
-#: breakpoint.c:1960
+#: breakpoint.c:1963
 #, possible-c-format
 msgid ""
 "Watchpoint %d deleted because the program has left the block\n"
 "in which its expression is valid.\n"
 msgstr ""
 
-#: breakpoint.c:2216
+#: breakpoint.c:2219
 msgid "No format string following the location"
 msgstr ""
 
-#: breakpoint.c:2494
+#: breakpoint.c:2497
 msgid ""
 "Note: automatically using hardware breakpoints for read-only addresses.\n"
 msgstr ""
 
-#: breakpoint.c:2505
+#: breakpoint.c:2508
 #, possible-c-format
 msgid ""
 "Cannot insert breakpoint %d.\n"
 "Cannot set software breakpoint at read-only address %s\n"
 msgstr ""
 
-#: breakpoint.c:2544
+#: breakpoint.c:2547
 #, possible-c-format
 msgid "hardware breakpoint %d not supported in overlay!"
 msgstr ""
 
-#: breakpoint.c:2748
+#: breakpoint.c:2751
 #, possible-c-format
 msgid ""
 "Error inserting catchpoint %d: Your system does not support this type\n"
 "of catchpoint."
 msgstr ""
 
-#: breakpoint.c:2752
+#: breakpoint.c:2755
 #, possible-c-format
 msgid "Error inserting catchpoint %d."
 msgstr ""
 
-#: breakpoint.c:3034
+#: breakpoint.c:3037
 #, possible-c-format
 msgid ""
 "Thread-specific breakpoint %d deleted - thread %s no longer in the thread "
 "list.\n"
 msgstr ""
 
-#: breakpoint.c:3599
+#: breakpoint.c:3602
 msgid "Cannot detach breakpoints of inferior_ptid"
 msgstr ""
 
-#: breakpoint.c:3756
+#: breakpoint.c:3759
 #, possible-c-format
 msgid "Could not remove hardware watchpoint %d."
 msgstr ""
 
-#: breakpoint.c:4456
+#: breakpoint.c:4459
 msgid "<unreadable>"
 msgstr ""
 
-#: breakpoint.c:4534
+#: breakpoint.c:4537
 msgid "print_bp_stop_message: unrecognized enum value"
 msgstr ""
 
-#: breakpoint.c:4550
+#: breakpoint.c:4553
 msgid "Stopped due to shared library event:\n"
 msgstr ""
 
-#: breakpoint.c:4552
+#: breakpoint.c:4555
 msgid "Stopped due to shared library event (no libraries added or removed)\n"
 msgstr ""
 
-#: breakpoint.c:4562
+#: breakpoint.c:4565
 msgid "  Inferior unloaded "
 msgstr ""
 
-#: breakpoint.c:4577
+#: breakpoint.c:4580
 msgid "  Inferior loaded "
 msgstr ""
 
-#: breakpoint.c:4994
+#: breakpoint.c:4997
 #, possible-c-format
 msgid "Watchpoint %d deleted.\n"
 msgstr ""
 
-#: breakpoint.c:5230
+#: breakpoint.c:5233
 msgid "Watchpoint condition cannot be tested in the current scope"
 msgstr ""
 
-#: breakpoint.c:5624
+#: breakpoint.c:5627
 msgid "bpstat_what: tracepoint encountered"
 msgstr ""
 
-#: breakpoint.c:5645
+#: breakpoint.c:5648
 #, possible-c-format
 msgid "bpstat_what: unhandled bptype %d"
 msgstr ""
 
-#: breakpoint.c:5922
+#: breakpoint.c:5925
 #, possible-c-format
 msgid "bptypes table does not describe type #%d."
 msgstr ""
 
-#: breakpoint.c:6637
+#: breakpoint.c:6640
 msgid "Note: breakpoint "
 msgstr ""
 
 #. if (others == ???)
-#: breakpoint.c:6639
+#: breakpoint.c:6642
 msgid "Note: breakpoints "
 msgstr ""
 
-#: breakpoint.c:6657
+#: breakpoint.c:6660
 #, possible-c-format
 msgid "also set at pc %ps.\n"
 msgstr ""
 
-#: breakpoint.c:6851
+#: breakpoint.c:6854
 #, possible-c-format
 msgid "Breakpoint %d address previously adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:6854
+#: breakpoint.c:6857
 #, possible-c-format
 msgid "Breakpoint address adjusted from %s to %s."
 msgstr ""
 
-#: breakpoint.c:6952
+#: breakpoint.c:6955
 msgid "unknown breakpoint type"
 msgstr ""
 
-#: breakpoint.c:7536
+#: breakpoint.c:7539
 #, possible-c-format
 msgid "Temporarily disabling breakpoints for unloaded shared library \"%s\""
 msgstr ""
 
-#: breakpoint.c:7731
+#: breakpoint.c:7734
 #, possible-c-format
 msgid "Catchpoint %d (fork)"
 msgstr ""
 
-#: breakpoint.c:7846
+#: breakpoint.c:7849
 #, possible-c-format
 msgid "Catchpoint %d (vfork)"
 msgstr ""
 
-#: breakpoint.c:8003
+#: breakpoint.c:8006
 #, possible-c-format
 msgid "load of library matching %s"
 msgstr ""
 
-#: breakpoint.c:8005
+#: breakpoint.c:8008
 msgid "load of library"
 msgstr ""
 
-#: breakpoint.c:8010
+#: breakpoint.c:8013
 #, possible-c-format
 msgid "unload of library matching %s"
 msgstr ""
 
-#: breakpoint.c:8012
+#: breakpoint.c:8015
 msgid "unload of library"
 msgstr ""
 
-#: breakpoint.c:8025
+#: breakpoint.c:8028
 #, possible-c-format
 msgid "Catchpoint %d (%s)"
 msgstr ""
 
-#: breakpoint.c:8065 stack.c:2385 symtab.c:4336 symtab.c:4728 symtab.c:4736
+#: breakpoint.c:8068 stack.c:2385 symtab.c:4336 symtab.c:4728 symtab.c:4736
 msgid "Invalid regexp"
 msgstr ""
 
-#: breakpoint.c:8261
+#: breakpoint.c:8264
 #, possible-c-format
 msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:8653 printcmd.c:2543
+#: breakpoint.c:8656 printcmd.c:2543
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
-#: breakpoint.c:8660
+#: breakpoint.c:8663
 msgid "No function supplied for dprintf call"
 msgstr ""
 
-#: breakpoint.c:8678
+#: breakpoint.c:8681
 msgid "Target cannot run dprintf commands, falling back to GDB printf"
 msgstr ""
 
-#: breakpoint.c:8684
+#: breakpoint.c:8687
 msgid "Invalid dprintf style."
 msgstr ""
 
-#: breakpoint.c:8740 breakpoint.c:14214
+#: breakpoint.c:8743 breakpoint.c:14243
 msgid "No hardware breakpoint support in the target."
 msgstr ""
 
-#: breakpoint.c:8742 breakpoint.c:9758 breakpoint.c:14216
+#: breakpoint.c:8745 breakpoint.c:9790 breakpoint.c:14245
 msgid "Hardware breakpoints used exceeds limit."
 msgstr ""
 
-#: breakpoint.c:8795 breakpoint.c:8803
+#: breakpoint.c:8798 breakpoint.c:8806
 #, possible-c-format
 msgid "Probed static tracepoint marker \"%s\"\n"
 msgstr ""
 
-#: breakpoint.c:8808
+#: breakpoint.c:8811
 msgid "Couldn't determine the static tracepoint marker to probe"
 msgstr ""
 
-#: breakpoint.c:8828
+#: breakpoint.c:8831
 #, possible-c-format
 msgid "Garbage '%s' follows condition"
 msgstr ""
 
-#: breakpoint.c:8838 breakpoint.c:9538
+#: breakpoint.c:8841 breakpoint.c:9570
 msgid "Format string required"
 msgstr ""
 
-#: breakpoint.c:8841
+#: breakpoint.c:8844
 #, possible-c-format
 msgid "Garbage '%s' at end of command"
 msgstr ""
 
-#: breakpoint.c:8981
+#: breakpoint.c:8984
 msgid "No default breakpoint address now."
 msgstr ""
 
-#: breakpoint.c:9050
+#: breakpoint.c:9053
 #, possible-c-format
 msgid "May not have a fast tracepoint at %s%s"
 msgstr ""
 
-#: breakpoint.c:9106
+#: breakpoint.c:9109
 msgid "Junk after thread keyword."
 msgstr ""
 
-#: breakpoint.c:9117
+#: breakpoint.c:9120
 msgid "Junk after task keyword."
 msgstr ""
 
-#: breakpoint.c:9119
+#: breakpoint.c:9122
 #, possible-c-format
 msgid "Unknown task %d."
 msgstr ""
 
-#: breakpoint.c:9149
+#: breakpoint.c:9152
 #, possible-c-format
 msgid "No known static tracepoint marker named %s"
 msgstr ""
 
-#: breakpoint.c:9213
+#: breakpoint.c:9251
 #, possible-c-format
 msgid "Make %s pending on future shared library load? "
 msgstr ""
 
-#: breakpoint.c:9274 mi/mi-cmd-break.c:343
+#: breakpoint.c:9312 mi/mi-cmd-break.c:343
 #, possible-c-format
 msgid "Garbage '%s' at end of location"
 msgstr ""
 
-#: breakpoint.c:9323
+#: breakpoint.c:9361
 msgid ""
 "Multiple breakpoints were set.\n"
 "Use the \"delete\" command to delete unwanted breakpoints."
 msgstr ""
 
-#: breakpoint.c:9381 linespec.c:2204
+#: breakpoint.c:9413 linespec.c:2204
 #, possible-c-format
 msgid "No line %d in file \"%s\"."
 msgstr ""
 
-#: breakpoint.c:9453
+#: breakpoint.c:9485
 msgid ""
 "Specify the type of breakpoint to set.\n"
 "Usage: stop in <function | address>\n"
 "       stop at <line>\n"
 msgstr ""
 
-#: breakpoint.c:9486
+#: breakpoint.c:9518
 msgid "Usage: stop in <function | address>\n"
 msgstr ""
 
-#: breakpoint.c:9518
+#: breakpoint.c:9550
 msgid "Usage: stop at LINE\n"
 msgstr ""
 
-#: breakpoint.c:9562
+#: breakpoint.c:9594
 msgid "May only run agent-printf on the target"
 msgstr ""
 
-#: breakpoint.c:9687
+#: breakpoint.c:9719
 #, possible-c-format
 msgid "Hardware assisted ranged breakpoint %d from %s to %s."
 msgstr ""
 
-#: breakpoint.c:9729 breakpoint.c:9802
+#: breakpoint.c:9761 breakpoint.c:9834
 msgid "Could not find location of the end of the range."
 msgstr ""
 
-#: breakpoint.c:9751
+#: breakpoint.c:9783
 msgid "This target does not support hardware ranged breakpoints."
 msgstr ""
 
-#: breakpoint.c:9762
+#: breakpoint.c:9794
 msgid "No address range specified."
 msgstr ""
 
-#: breakpoint.c:9770
+#: breakpoint.c:9802
 msgid "Too few arguments."
 msgstr ""
 
-#: breakpoint.c:9772
+#: breakpoint.c:9804
 msgid "Could not find location of the beginning of the range."
 msgstr ""
 
-#: breakpoint.c:9778 breakpoint.c:9807
+#: breakpoint.c:9810 breakpoint.c:9839
 msgid "Cannot create a ranged breakpoint with multiple locations."
 msgstr ""
 
-#: breakpoint.c:9813
+#: breakpoint.c:9845
 msgid "Invalid address range, end precedes start."
 msgstr ""
 
 #. Length overflowed.
-#: breakpoint.c:9818
+#: breakpoint.c:9850
 msgid "Address range too large."
 msgstr ""
 
-#: breakpoint.c:10192 breakpoint.c:10329 breakpoint.c:10385 breakpoint.c:10416
+#: breakpoint.c:10224 breakpoint.c:10361 breakpoint.c:10417 breakpoint.c:10448
 msgid "Invalid hardware watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10223
+#: breakpoint.c:10255
 msgid "Invalid watchpoint type."
 msgstr ""
 
-#: breakpoint.c:10333
+#: breakpoint.c:10365
 msgid ""
 "\n"
 "Check the underlying instruction at PC for the memory\n"
 "address and value which triggered this watchpoint.\n"
 msgstr ""
 
-#: breakpoint.c:10504
+#: breakpoint.c:10536
 msgid "You can specify only one thread."
 msgstr ""
 
-#: breakpoint.c:10523
+#: breakpoint.c:10555
 msgid "You can specify only one mask."
 msgstr ""
 
-#: breakpoint.c:10566
+#: breakpoint.c:10598
 #, possible-c-format
 msgid "Cannot watch constant value `%.*s'."
 msgstr ""
 
-#: breakpoint.c:10595
+#: breakpoint.c:10627
 msgid "This target does not support masked watchpoints."
 msgstr ""
 
-#: breakpoint.c:10597
+#: breakpoint.c:10629
 msgid "Invalid mask or memory region."
 msgstr ""
 
-#: breakpoint.c:10620
+#: breakpoint.c:10652
 msgid "Junk at end of command."
 msgstr ""
 
-#: breakpoint.c:10988
+#: breakpoint.c:11020
 msgid "Couldn't get information on specified line."
 msgstr ""
 
-#: breakpoint.c:11142
+#: breakpoint.c:11174
 msgid "unsupported or unknown fork kind; cannot catch it"
 msgstr ""
 
-#: breakpoint.c:11219 breakpoint.c:11226
+#: breakpoint.c:11251 breakpoint.c:11258
 msgid "Catch requires an event name."
 msgstr ""
 
-#: breakpoint.c:11276
+#: breakpoint.c:11308
 msgid "No source file specified."
 msgstr ""
 
-#: breakpoint.c:11370
+#: breakpoint.c:11402
 #, possible-c-format
 msgid "No breakpoint at %s."
 msgstr ""
 
-#: breakpoint.c:11372
+#: breakpoint.c:11404
 msgid "No breakpoint at this line."
 msgstr ""
 
-#: breakpoint.c:11393
+#: breakpoint.c:11425
 msgid "Deleted breakpoint "
 msgstr ""
 
-#: breakpoint.c:11395
+#: breakpoint.c:11427
 msgid "Deleted breakpoints "
 msgstr ""
 
@@ -3934,237 +3934,237 @@ msgstr ""
 #. Note that at this point, old_loc->owner is still
 #. valid, as delete_breakpoint frees the breakpoint
 #. only after calling us.
-#: breakpoint.c:11816
+#: breakpoint.c:11848
 #, possible-c-format
 msgid "warning: Error removing breakpoint %d\n"
 msgstr ""
 
-#: breakpoint.c:12050
+#: breakpoint.c:12082
 #, possible-c-format
 msgid " (%s) pending."
 msgstr ""
 
-#: breakpoint.c:12055
+#: breakpoint.c:12087
 #, possible-c-format
 msgid " (%s,%s) pending."
 msgstr ""
 
-#: breakpoint.c:12061
+#: breakpoint.c:12093
 #, possible-c-format
 msgid " (%s %s) pending."
 msgstr ""
 
-#: breakpoint.c:12408
+#: breakpoint.c:12440
 msgid "Temporary breakpoint"
 msgstr ""
 
-#: breakpoint.c:12410
+#: breakpoint.c:12442
 msgid "Breakpoint"
 msgstr ""
 
-#: breakpoint.c:12411 breakpoint.c:12724 breakpoint.c:12728 breakpoint.c:12732
+#: breakpoint.c:12443 breakpoint.c:12756 breakpoint.c:12760 breakpoint.c:12764
 #, possible-c-format
 msgid " %d"
 msgstr ""
 
-#: breakpoint.c:12413
+#: breakpoint.c:12445
 msgid " at gnu-indirect-function resolver"
 msgstr ""
 
-#: breakpoint.c:12416
+#: breakpoint.c:12448
 #, possible-c-format
 msgid "Hardware assisted breakpoint %d"
 msgstr ""
 
-#: breakpoint.c:12419
+#: breakpoint.c:12451
 #, possible-c-format
 msgid "Dprintf %d"
 msgstr ""
 
-#: breakpoint.c:12440
+#: breakpoint.c:12472
 #, possible-c-format
 msgid "unhandled breakpoint type %d"
 msgstr ""
 
 #. Not sure how we will get here.
 #. GDB should not stop for these breakpoints.
-#: breakpoint.c:12553
+#: breakpoint.c:12585
 msgid "Thread Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. By analogy with the thread event, GDB should not stop for these.
-#: breakpoint.c:12558
+#: breakpoint.c:12590
 msgid "Overlay Event Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:12563
+#: breakpoint.c:12595
 msgid "Longjmp Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:12568
+#: breakpoint.c:12600
 msgid "std::terminate Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
 #. These should never be enabled.
-#: breakpoint.c:12574
+#: breakpoint.c:12606
 msgid "Exception Master Breakpoint: gdb should not stop!\n"
 msgstr ""
 
-#: breakpoint.c:12677
+#: breakpoint.c:12709
 msgid "probe not found"
 msgstr ""
 
-#: breakpoint.c:12723
+#: breakpoint.c:12755
 msgid "Tracepoint"
 msgstr ""
 
-#: breakpoint.c:12727
+#: breakpoint.c:12759
 msgid "Fast tracepoint"
 msgstr ""
 
-#: breakpoint.c:12731
+#: breakpoint.c:12763
 msgid "Static tracepoint"
 msgstr ""
 
-#: breakpoint.c:12736 breakpoint.c:12755
+#: breakpoint.c:12768 breakpoint.c:12787
 #, possible-c-format
 msgid "unhandled tracepoint type %d"
 msgstr ""
 
-#: breakpoint.c:12987
+#: breakpoint.c:13016
 #, possible-c-format
 msgid "marker %s not found"
 msgstr ""
 
-#: breakpoint.c:13151
+#: breakpoint.c:13180
 msgid "Delete all breakpoints? "
 msgstr ""
 
-#: breakpoint.c:13267
+#: breakpoint.c:13296
 #, possible-c-format
 msgid "static tracepoint %d changed probed marker from %s to %s"
 msgstr ""
 
-#: breakpoint.c:13298
+#: breakpoint.c:13327
 #, possible-c-format
 msgid "marker for static tracepoint %d (%s) not found at previous line number"
 msgstr ""
 
-#: breakpoint.c:13428
+#: breakpoint.c:13457
 #, possible-c-format
 msgid "Could not reset ranged breakpoint %d: multiple locations found\n"
 msgstr ""
 
-#: breakpoint.c:13468
+#: breakpoint.c:13497
 #, possible-c-format
 msgid "failed to reevaluate condition for breakpoint %d: %s"
 msgstr ""
 
-#: breakpoint.c:13809
+#: breakpoint.c:13838
 #, possible-c-format
 msgid "Ignore count ignored for tracepoint %d."
 msgstr ""
 
-#: breakpoint.c:13818
+#: breakpoint.c:13847
 #, possible-c-format
 msgid "Will stop next time breakpoint %d is reached."
 msgstr ""
 
-#: breakpoint.c:13822
+#: breakpoint.c:13851
 #, possible-c-format
 msgid "Will ignore next crossing of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:13825
+#: breakpoint.c:13854
 #, possible-c-format
 msgid "Will ignore next %d crossings of breakpoint %d."
 msgstr ""
 
-#: breakpoint.c:13845
+#: breakpoint.c:13874
 msgid "a breakpoint number"
 msgstr ""
 
-#: breakpoint.c:13849
+#: breakpoint.c:13878
 #, possible-c-format
 msgid "bad breakpoint number: '%s'"
 msgstr ""
 
-#: breakpoint.c:13851
+#: breakpoint.c:13880
 msgid "Second argument (specified ignore-count) is missing."
 msgstr ""
 
-#: breakpoint.c:13870
+#: breakpoint.c:13899
 #, possible-c-format
 msgid "bad breakpoint number at or near '%d'"
 msgstr ""
 
-#: breakpoint.c:13889
+#: breakpoint.c:13918
 #, possible-c-format
 msgid "No breakpoint number %d.\n"
 msgstr ""
 
-#: breakpoint.c:13902
+#: breakpoint.c:13931
 msgid "one or more breakpoint numbers"
 msgstr ""
 
-#: breakpoint.c:13928
+#: breakpoint.c:13957
 #, possible-c-format
 msgid "Bad breakpoint number '%d'"
 msgstr ""
 
-#: breakpoint.c:13931 breakpoint.c:13938
+#: breakpoint.c:13960 breakpoint.c:13967
 #, possible-c-format
 msgid "Bad breakpoint location number '%d'"
 msgstr ""
 
-#: breakpoint.c:13965
+#: breakpoint.c:13994
 #, possible-c-format
 msgid "Negative breakpoint number '%.*s'"
 msgstr ""
 
-#: breakpoint.c:13966
+#: breakpoint.c:13995
 #, possible-c-format
 msgid "Negative breakpoint location number '%.*s'"
 msgstr ""
 
-#: breakpoint.c:13970
+#: breakpoint.c:13999
 #, possible-c-format
 msgid "Bad breakpoint number '%.*s'"
 msgstr ""
 
-#: breakpoint.c:13971
+#: breakpoint.c:14000
 #, possible-c-format
 msgid "Bad breakpoint location number '%.*s'"
 msgstr ""
 
-#: breakpoint.c:13997 breakpoint.c:14047
+#: breakpoint.c:14026 breakpoint.c:14076
 #, possible-c-format
 msgid "Bad breakpoint number at or near: '%s'"
 msgstr ""
 
-#: breakpoint.c:13998
+#: breakpoint.c:14027
 #, possible-c-format
 msgid "Bad breakpoint location number at or near: '%s'"
 msgstr ""
 
-#: breakpoint.c:14009
+#: breakpoint.c:14038
 #, possible-c-format
 msgid "Inverted breakpoint range at '%.*s'"
 msgstr ""
 
-#: breakpoint.c:14010
+#: breakpoint.c:14039
 #, possible-c-format
 msgid "Inverted breakpoint location range at '%.*s'"
 msgstr ""
 
-#: breakpoint.c:14235
+#: breakpoint.c:14264
 #, possible-c-format
 msgid "Cannot enable watchpoint %d: "
 msgstr ""
 
-#: breakpoint.c:14300
+#: breakpoint.c:14329
 msgid "hit count"
 msgstr ""
 
@@ -4172,72 +4172,72 @@ msgstr ""
 #. address.  Since there is no way to confirm that the address
 #. means the same thing as when the trace was started, warn the
 #. user.
-#: breakpoint.c:14586
+#: breakpoint.c:14610
 #, possible-c-format
 msgid "Uploaded tracepoint %d has no source location, using raw address"
 msgstr ""
 
-#: breakpoint.c:14595
+#: breakpoint.c:14619
 #, possible-c-format
 msgid "Uploaded tracepoint %d condition has no source form, ignoring it"
 msgstr ""
 
-#: breakpoint.c:14645
+#: breakpoint.c:14669
 #, possible-c-format
 msgid "Uploaded tracepoint %d actions have no source form, ignoring them"
 msgstr ""
 
-#: breakpoint.c:14719
+#: breakpoint.c:14743
 msgid "Delete all tracepoints? "
 msgstr ""
 
-#: breakpoint.c:14742
+#: breakpoint.c:14766
 #, possible-c-format
 msgid "Setting tracepoint %d's passcount to %d\n"
 msgstr ""
 
-#: breakpoint.c:14759
+#: breakpoint.c:14783
 msgid "passcount command requires an argument (count + optional TP num)"
 msgstr ""
 
-#: breakpoint.c:14855
+#: breakpoint.c:14879
 #, possible-c-format
 msgid "bad tracepoint number at or near '%s'\n"
 msgstr ""
 
-#: breakpoint.c:14858
+#: breakpoint.c:14882
 msgid "No previous tracepoint\n"
 msgstr ""
 
-#: breakpoint.c:14898
+#: breakpoint.c:14922
 msgid "Argument required (file name in which to save)"
 msgstr ""
 
-#: breakpoint.c:14924
+#: breakpoint.c:14948
 msgid "Nothing to save."
 msgstr ""
 
-#: breakpoint.c:14933
+#: breakpoint.c:14957
 #, possible-c-format
 msgid "Unable to open file '%s' for saving (%s)"
 msgstr ""
 
-#: breakpoint.c:15001
+#: breakpoint.c:15025
 #, possible-c-format
 msgid "Saved to file '%s'.\n"
 msgstr ""
 
-#: breakpoint.c:15120
+#: breakpoint.c:15144
 msgid "\"save\" must be followed by the name of a save subcommand.\n"
 msgstr ""
 
-#: breakpoint.c:15393
+#: breakpoint.c:15417
 msgid ""
 "Set ignore-count of breakpoint number N to COUNT.\n"
 "Usage is `ignore N COUNT'."
 msgstr ""
 
-#: breakpoint.c:15398
+#: breakpoint.c:15422
 msgid ""
 "Set commands to be executed when the given breakpoints are hit.\n"
 "Give a space-separated breakpoint list as argument after \"commands\".\n"
@@ -4250,14 +4250,14 @@ msgid ""
 "then no output is printed when it is hit, except what the commands print."
 msgstr ""
 
-#: breakpoint.c:15409
+#: breakpoint.c:15433
 msgid ""
 "Specify breakpoint number N to break only if COND is true.\n"
 "Usage is `condition N COND', where N is an integer and COND is an\n"
 "expression to be evaluated whenever breakpoint N is reached."
 msgstr ""
 
-#: breakpoint.c:15415
+#: breakpoint.c:15439
 msgid ""
 "Set a temporary breakpoint.\n"
 "Like \"break\" except the breakpoint is only temporary,\n"
@@ -4266,7 +4266,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15424
+#: breakpoint.c:15448
 msgid ""
 "Set a hardware assisted breakpoint.\n"
 "Like \"break\" except the breakpoint requires hardware support,\n"
@@ -4274,7 +4274,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15432
+#: breakpoint.c:15456
 msgid ""
 "Set a temporary hardware assisted breakpoint.\n"
 "Like \"hbreak\" except the breakpoint is only temporary,\n"
@@ -4282,7 +4282,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15440
+#: breakpoint.c:15464
 msgid ""
 "Enable all or some breakpoints.\n"
 "Usage: enable [BREAKPOINTNUM]...\n"
@@ -4292,7 +4292,7 @@ msgid ""
 "With a subcommand you can enable temporarily."
 msgstr ""
 
-#: breakpoint.c:15451
+#: breakpoint.c:15475
 msgid ""
 "Enable all or some breakpoints.\n"
 "Usage: enable breakpoints [BREAKPOINTNUM]...\n"
@@ -4301,21 +4301,21 @@ msgid ""
 "May be abbreviated to simply \"enable\"."
 msgstr ""
 
-#: breakpoint.c:15459
+#: breakpoint.c:15483
 msgid ""
 "Enable some breakpoints for one hit.\n"
 "Usage: enable breakpoints once BREAKPOINTNUM...\n"
 "If a breakpoint is hit while enabled in this fashion, it becomes disabled."
 msgstr ""
 
-#: breakpoint.c:15465
+#: breakpoint.c:15489
 msgid ""
 "Enable some breakpoints and delete when hit.\n"
 "Usage: enable breakpoints delete BREAKPOINTNUM...\n"
 "If a breakpoint is hit while enabled in this fashion, it is deleted."
 msgstr ""
 
-#: breakpoint.c:15471
+#: breakpoint.c:15495
 msgid ""
 "Enable some breakpoints for COUNT hits.\n"
 "Usage: enable breakpoints count COUNT BREAKPOINTNUM...\n"
@@ -4323,21 +4323,21 @@ msgid ""
 "the count is decremented; when it reaches zero, the breakpoint is disabled."
 msgstr ""
 
-#: breakpoint.c:15478
+#: breakpoint.c:15502
 msgid ""
 "Enable some breakpoints and delete when hit.\n"
 "Usage: enable delete BREAKPOINTNUM...\n"
 "If a breakpoint is hit while enabled in this fashion, it is deleted."
 msgstr ""
 
-#: breakpoint.c:15484
+#: breakpoint.c:15508
 msgid ""
 "Enable some breakpoints for one hit.\n"
 "Usage: enable once BREAKPOINTNUM...\n"
 "If a breakpoint is hit while enabled in this fashion, it becomes disabled."
 msgstr ""
 
-#: breakpoint.c:15490
+#: breakpoint.c:15514
 msgid ""
 "Enable some breakpoints for COUNT hits.\n"
 "Usage: enable count COUNT BREAKPOINTNUM...\n"
@@ -4345,7 +4345,7 @@ msgid ""
 "the count is decremented; when it reaches zero, the breakpoint is disabled."
 msgstr ""
 
-#: breakpoint.c:15497
+#: breakpoint.c:15521
 msgid ""
 "Disable all or some breakpoints.\n"
 "Usage: disable [BREAKPOINTNUM]...\n"
@@ -4354,7 +4354,7 @@ msgid ""
 "A disabled breakpoint is not forgotten, but has no effect until re-enabled."
 msgstr ""
 
-#: breakpoint.c:15507
+#: breakpoint.c:15531
 msgid ""
 "Disable all or some breakpoints.\n"
 "Usage: disable breakpoints [BREAKPOINTNUM]...\n"
@@ -4364,7 +4364,7 @@ msgid ""
 "This command may be abbreviated \"disable\"."
 msgstr ""
 
-#: breakpoint.c:15516
+#: breakpoint.c:15540
 msgid ""
 "Delete all or some breakpoints.\n"
 "Usage: delete [BREAKPOINTNUM]...\n"
@@ -4374,7 +4374,7 @@ msgid ""
 "Also a prefix command for deletion of other GDB objects."
 msgstr ""
 
-#: breakpoint.c:15527
+#: breakpoint.c:15551
 msgid ""
 "Delete all or some breakpoints or auto-display expressions.\n"
 "Usage: delete breakpoints [BREAKPOINTNUM]...\n"
@@ -4383,7 +4383,7 @@ msgid ""
 "This command may be abbreviated \"delete\"."
 msgstr ""
 
-#: breakpoint.c:15535
+#: breakpoint.c:15559
 msgid ""
 "Clear breakpoint at specified location.\n"
 "Argument may be a linespec, explicit, or address location as described "
@@ -4395,23 +4395,23 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15545
+#: breakpoint.c:15569
 msgid "Set breakpoint at specified location.\n"
 msgstr ""
 
-#: breakpoint.c:15557
+#: breakpoint.c:15581
 msgid "Break in function/address or break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15561
+#: breakpoint.c:15585
 msgid "Break in function or address."
 msgstr ""
 
-#: breakpoint.c:15563
+#: breakpoint.c:15587
 msgid "Break at a line in the current file."
 msgstr ""
 
-#: breakpoint.c:15564
+#: breakpoint.c:15588
 msgid ""
 "Status of user-settable breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -4433,7 +4433,7 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15581
+#: breakpoint.c:15605
 msgid ""
 "Status of specified breakpoints (all user-settable breakpoints if no "
 "argument).\n"
@@ -4456,7 +4456,7 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15599
+#: breakpoint.c:15623
 msgid ""
 "Status of all breakpoints, or breakpoint number NUMBER.\n"
 "The \"Type\" column indicates one of:\n"
@@ -4482,43 +4482,43 @@ msgid ""
 "breakpoint set."
 msgstr ""
 
-#: breakpoint.c:15620
+#: breakpoint.c:15644
 msgid "Set catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15625
+#: breakpoint.c:15649
 msgid "Set temporary catchpoints to catch events."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15630
+#: breakpoint.c:15654
 msgid "Catch calls to fork."
 msgstr ""
 
-#: breakpoint.c:15635
+#: breakpoint.c:15659
 msgid "Catch calls to vfork."
 msgstr ""
 
-#: breakpoint.c:15640
+#: breakpoint.c:15664
 msgid "Catch calls to exec."
 msgstr ""
 
-#: breakpoint.c:15645
+#: breakpoint.c:15669
 msgid ""
 "Catch loads of shared libraries.\n"
 "Usage: catch load [REGEX]\n"
 "If REGEX is given, only stop for libraries matching the regular expression."
 msgstr ""
 
-#: breakpoint.c:15652
+#: breakpoint.c:15676
 msgid ""
 "Catch unloads of shared libraries.\n"
 "Usage: catch unload [REGEX]\n"
 "If REGEX is given, only stop for libraries matching the regular expression."
 msgstr ""
 
-#: breakpoint.c:15660
+#: breakpoint.c:15684
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: watch [-l|-location] EXPRESSION\n"
@@ -4528,7 +4528,7 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:15669
+#: breakpoint.c:15693
 msgid ""
 "Set a read watchpoint for an expression.\n"
 "Usage: rwatch [-l|-location] EXPRESSION\n"
@@ -4538,7 +4538,7 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:15678
+#: breakpoint.c:15702
 msgid ""
 "Set a watchpoint for an expression.\n"
 "Usage: awatch [-l|-location] EXPRESSION\n"
@@ -4548,19 +4548,19 @@ msgid ""
 "the memory to which it refers."
 msgstr ""
 
-#: breakpoint.c:15687
+#: breakpoint.c:15711
 msgid "Status of specified watchpoints (all watchpoints if no argument)."
 msgstr ""
 
-#: breakpoint.c:15693
+#: breakpoint.c:15717
 msgid "Set debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:15694
+#: breakpoint.c:15718
 msgid "Show debugger's willingness to use watchpoint hardware."
 msgstr ""
 
-#: breakpoint.c:15695
+#: breakpoint.c:15719
 msgid ""
 "If zero, gdb will not use hardware for new watchpoints, even if\n"
 "such is available.  (However, any hardware watchpoints that were\n"
@@ -4569,19 +4569,19 @@ msgid ""
 msgstr ""
 
 #. Tracepoint manipulation commands.
-#: breakpoint.c:15708
+#: breakpoint.c:15732
 msgid ""
 "Set a tracepoint at specified location.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:15720
+#: breakpoint.c:15744
 msgid ""
 "Set a fast tracepoint at specified location.\n"
 "\n"
 msgstr ""
 
-#: breakpoint.c:15727
+#: breakpoint.c:15751
 msgid ""
 "Set a static tracepoint at location or marker.\n"
 "\n"
@@ -4601,35 +4601,35 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15749
+#: breakpoint.c:15773
 msgid ""
 "Status of specified tracepoints (all tracepoints if no argument).\n"
 "Convenience variable \"$tpnum\" contains the number of the\n"
 "last tracepoint set."
 msgstr ""
 
-#: breakpoint.c:15756
+#: breakpoint.c:15780
 msgid ""
 "Delete specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means delete all tracepoints."
 msgstr ""
 
-#: breakpoint.c:15763
+#: breakpoint.c:15787
 msgid ""
 "Disable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means disable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:15770
+#: breakpoint.c:15794
 msgid ""
 "Enable specified tracepoints.\n"
 "Arguments are tracepoint numbers, separated by spaces.\n"
 "No argument means enable all tracepoints."
 msgstr ""
 
-#: breakpoint.c:15777
+#: breakpoint.c:15801
 msgid ""
 "Set the passcount for a tracepoint.\n"
 "The trace will end when the tracepoint has been passed 'count' times.\n"
@@ -4637,12 +4637,12 @@ msgid ""
 "if TPNUM is omitted, passcount refers to the last tracepoint defined."
 msgstr ""
 
-#: breakpoint.c:15784
+#: breakpoint.c:15808
 msgid "Save breakpoint definitions as a script."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15788
+#: breakpoint.c:15812
 msgid ""
 "Save current breakpoint definitions as a script.\n"
 "This includes all types of breakpoints (breakpoints, watchpoints,\n"
@@ -4650,29 +4650,29 @@ msgid ""
 "session to restore them."
 msgstr ""
 
-#: breakpoint.c:15796
+#: breakpoint.c:15820
 msgid ""
 "Save current tracepoint definitions as a script.\n"
 "Use the 'source' command in another debug session to restore them."
 msgstr ""
 
 #. allow-unknown
-#: breakpoint.c:15805 breakpoint.c:15811
+#: breakpoint.c:15829 breakpoint.c:15835
 msgid ""
 "Breakpoint specific settings.\n"
 "Configure various breakpoint-specific variables such as\n"
 "pending breakpoint behavior."
 msgstr ""
 
-#: breakpoint.c:15819
+#: breakpoint.c:15843
 msgid "Set debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:15820
+#: breakpoint.c:15844
 msgid "Show debugger's behavior regarding pending breakpoints."
 msgstr ""
 
-#: breakpoint.c:15821
+#: breakpoint.c:15845
 msgid ""
 "If on, an unrecognized breakpoint location will cause gdb to create a\n"
 "pending breakpoint.  If off, an unrecognized breakpoint location results in\n"
@@ -4680,15 +4680,15 @@ msgid ""
 "user-query to see if a pending breakpoint should be created."
 msgstr ""
 
-#: breakpoint.c:15834
+#: breakpoint.c:15858
 msgid "Set automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:15835
+#: breakpoint.c:15859
 msgid "Show automatic usage of hardware breakpoints."
 msgstr ""
 
-#: breakpoint.c:15836
+#: breakpoint.c:15860
 msgid ""
 "If set, the debugger will automatically use hardware breakpoints for\n"
 "breakpoints set with \"break\" but falling in read-only memory.  If not "
@@ -4696,15 +4696,15 @@ msgid ""
 "a warning will be emitted for such breakpoints."
 msgstr ""
 
-#: breakpoint.c:15846
+#: breakpoint.c:15870
 msgid "Set mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:15847
+#: breakpoint.c:15871
 msgid "Show mode for inserting breakpoints."
 msgstr ""
 
-#: breakpoint.c:15848
+#: breakpoint.c:15872
 msgid ""
 "When this mode is on, breakpoints are inserted immediately as soon as\n"
 "they're created, kept inserted even when execution stops, and removed\n"
@@ -4713,15 +4713,15 @@ msgid ""
 "when execution stops."
 msgstr ""
 
-#: breakpoint.c:15861
+#: breakpoint.c:15885
 msgid "Set mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:15862
+#: breakpoint.c:15886
 msgid "Show mode of breakpoint condition evaluation."
 msgstr ""
 
-#: breakpoint.c:15863
+#: breakpoint.c:15887
 msgid ""
 "When this is set to \"host\", breakpoint conditions will be\n"
 "evaluated on the host's side by GDB.  When it is set to \"target\",\n"
@@ -4733,7 +4733,7 @@ msgid ""
 "be set to \"gdb\""
 msgstr ""
 
-#: breakpoint.c:15876
+#: breakpoint.c:15900
 msgid ""
 "Set a breakpoint for an address range.\n"
 "break-range START-LOCATION, END-LOCATION\n"
@@ -4751,7 +4751,7 @@ msgid ""
 "range (including START-LOCATION and END-LOCATION)."
 msgstr ""
 
-#: breakpoint.c:15892
+#: breakpoint.c:15916
 msgid ""
 "Set a dynamic printf at specified location.\n"
 "dprintf location,format string,arg1,arg2,...\n"
@@ -4759,15 +4759,15 @@ msgid ""
 "\n"
 msgstr ""
 
-#: breakpoint.c:15900
+#: breakpoint.c:15924
 msgid "Set the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15901
+#: breakpoint.c:15925
 msgid "Show the style of usage for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15902
+#: breakpoint.c:15926
 msgid ""
 "This setting chooses how GDB will do a dynamic printf.\n"
 "If the value is \"gdb\", then the printing is done by GDB to its own\n"
@@ -4777,37 +4777,37 @@ msgid ""
 "output stream by setting dprintf-function and dprintf-channel."
 msgstr ""
 
-#: breakpoint.c:15914
+#: breakpoint.c:15938
 msgid "Set the function to use for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15915
+#: breakpoint.c:15939
 msgid "Show the function to use for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15922
+#: breakpoint.c:15946
 msgid "Set the channel to use for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15923
+#: breakpoint.c:15947
 msgid "Show the channel to use for dynamic printf."
 msgstr ""
 
-#: breakpoint.c:15929
+#: breakpoint.c:15953
 msgid "Set whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:15930
+#: breakpoint.c:15954
 msgid "Show whether dprintf continues after GDB disconnects."
 msgstr ""
 
-#: breakpoint.c:15931
+#: breakpoint.c:15955
 msgid ""
 "Use this to let dprintf commands continue to hit and produce output\n"
 "even if GDB disconnects or detaches from the target."
 msgstr ""
 
-#: breakpoint.c:15938
+#: breakpoint.c:15962
 #, possible-c-format
 msgid ""
 "Target agent only formatted printing, like the C \"printf\" function.\n"
@@ -13642,49 +13642,49 @@ msgstr ""
 msgid "Unsupported field kind %d by check_types_equal"
 msgstr ""
 
-#: gdbtypes.c:4458
+#: gdbtypes.c:4455
 #, possible-c-format
 msgid ") length %d\n"
 msgstr ""
 
-#: gdbtypes.c:4607
+#: gdbtypes.c:4604
 msgid " <same as already seen type>\n"
 msgstr ""
 
-#: gdbtypes.c:5054
+#: gdbtypes.c:5051
 #, possible-c-format
 msgid "Unexpected type field location kind: %d"
 msgstr ""
 
-#: gdbtypes.c:5699
+#: gdbtypes.c:5696
 msgid "Set debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:5700
+#: gdbtypes.c:5697
 msgid "Show debugging of C++ overloading."
 msgstr ""
 
-#: gdbtypes.c:5701
+#: gdbtypes.c:5698
 msgid "When enabled, ranking of the functions is displayed."
 msgstr ""
 
-#: gdbtypes.c:5710
+#: gdbtypes.c:5707
 msgid ""
 "Set resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
-#: gdbtypes.c:5712
+#: gdbtypes.c:5709
 msgid ""
 "Show resolution of opaque struct/class/union types (if set before loading "
 "symbols)."
 msgstr ""
 
-#: gdbtypes.c:5721
+#: gdbtypes.c:5718
 msgid "Set strict type checking."
 msgstr ""
 
-#: gdbtypes.c:5722
+#: gdbtypes.c:5719
 msgid "Show strict type checking."
 msgstr ""
 
@@ -14437,8 +14437,8 @@ msgstr ""
 msgid "not member of enumeration"
 msgstr ""
 
-#: guile/scm-param.c:722 guile/scm-utils.c:215 guile/scm-breakpoint.c:587
-#: guile/scm-breakpoint.c:626
+#: guile/scm-param.c:722 guile/scm-utils.c:215 guile/scm-breakpoint.c:589
+#: guile/scm-breakpoint.c:628
 msgid "boolean"
 msgstr ""
 
@@ -14451,8 +14451,8 @@ msgid "integer or #:unlimited"
 msgstr ""
 
 #: guile/scm-param.c:762 guile/scm-type.c:1109 guile/scm-ports.c:1179
-#: guile/scm-ports.c:1221 guile/scm-breakpoint.c:664
-#: guile/scm-breakpoint.c:705
+#: guile/scm-ports.c:1221 guile/scm-breakpoint.c:666
+#: guile/scm-breakpoint.c:707
 msgid "integer"
 msgstr ""
 
@@ -14962,27 +14962,27 @@ msgstr ""
 msgid "breakpoint is already registered"
 msgstr ""
 
-#: guile/scm-breakpoint.c:714
+#: guile/scm-breakpoint.c:716
 msgid "hit-count must be zero"
 msgstr ""
 
-#: guile/scm-breakpoint.c:751
+#: guile/scm-breakpoint.c:753
 msgid "invalid thread id"
 msgstr ""
 
-#: guile/scm-breakpoint.c:757 guile/scm-breakpoint.c:812
+#: guile/scm-breakpoint.c:759 guile/scm-breakpoint.c:814
 msgid "integer or #f"
 msgstr ""
 
-#: guile/scm-breakpoint.c:806
+#: guile/scm-breakpoint.c:808
 msgid "invalid task id"
 msgstr ""
 
-#: guile/scm-breakpoint.c:897
+#: guile/scm-breakpoint.c:899
 msgid "string or #f"
 msgstr ""
 
-#: guile/scm-breakpoint.c:936
+#: guile/scm-breakpoint.c:938
 msgid "procedure or #f"
 msgstr ""
 
@@ -23531,15 +23531,15 @@ msgstr ""
 msgid "Line keyword should be an integer or a string. "
 msgstr ""
 
-#: python/py-breakpoint.c:854
+#: python/py-breakpoint.c:857
 msgid "Cannot understand watchpoint access type."
 msgstr ""
 
-#: python/py-breakpoint.c:858
+#: python/py-breakpoint.c:861
 msgid "Do not understand breakpoint type to set."
 msgstr ""
 
-#: python/py-breakpoint.c:1036
+#: python/py-breakpoint.c:1039
 msgid "Error while creating breakpoint from GDB."
 msgstr ""
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/python/py-breakpoint.c ./gdb/python/py-breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/python/py-breakpoint.c	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/python/py-breakpoint.c	2019-12-10 01:49:26.000000000 +0000
@@ -828,13 +828,16 @@ bppy_init (PyObject *self, PyObject *arg
 		location = new_explicit_location (&explicit_loc);
 	      }
 
+	    const struct breakpoint_ops *ops =
+	      breakpoint_ops_for_event_location (location.get (), false);
+
 	    create_breakpoint (python_gdbarch,
 			       location.get (), NULL, -1, NULL,
 			       0,
 			       temporary_bp, bp_breakpoint,
 			       0,
 			       AUTO_BOOLEAN_TRUE,
-			       &bkpt_breakpoint_ops,
+			       ops,
 			       0, 1, internal_bp, 0);
 	    break;
 	  }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/ChangeLog ./gdb/testsuite/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/ChangeLog	2019-12-09 01:49:30.000000000 +0000
+++ ./gdb/testsuite/ChangeLog	2019-12-10 01:49:26.000000000 +0000
@@ -1,3 +1,36 @@
+2019-12-10  George Barrett  <bob@bob131.so>
+
+	Test scripted probe breakpoints.
+	* gdb.guile/scm-breakpoint.c (main): Add probe point.
+	* gdb.python/py-breakpoint.c (main): Likewise.
+	* gdb.guile/scm-breakpoint.exp (test_bkpt_probe): Add probe
+	specifier test.
+	* gdb.python/py-breakpoint.exp (test_bkpt_probe): Likewise.
+
+2019-12-09  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	* gdb.cp/rvalue-ref-overload.cc (g): New function that takes
+	an rvalue parameter.
+	* gdb.cp/rvalue-ref-overload.exp: Test calling it with an lvalue
+	parameter.
+
+2019-12-09  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.mi/mi-fortran-modules.exp: Add patterns to skip system
+	modules.
+
+2019-12-09  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.fortran/derived-type-striding.exp: KFAIL if we are using a
+	broken version of GCC.
+
+2019-12-09  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+	* gdb.fortran/info-modules.exp: Rewrite to make use of new
+	sym-info-cmds library.
+	* gdb.fortran/info-types.exp: Likewise.
+	* lib/sym-info-cmds.exp: New file.
+
 2019-12-08  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.dwarf2/imported-unit.exp: Fix inter-CU references.
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.cp/rvalue-ref-overload.cc ./gdb/testsuite/gdb.cp/rvalue-ref-overload.cc
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.cp/rvalue-ref-overload.cc	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.cp/rvalue-ref-overload.cc	2019-12-10 01:49:26.000000000 +0000
@@ -62,6 +62,12 @@ f (int &&x)
   return 3;
 }
 
+static int
+g (int &&x)
+{
+  return x;
+}
+
 int
 main ()
 {
@@ -78,6 +84,12 @@ main ()
   int test_const // = 3
     = foo_rr_instance1.overloadConst (arg);
 
+  /* The statement below is illegal: cannot bind rvalue reference of
+     type 'int&&' to lvalue of type 'int'.
+
+     result = g (i); */
+  result = g (5); // this is OK
+
   marker1 (); // marker1-returns-here
   return result;
 }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp ./gdb/testsuite/gdb.cp/rvalue-ref-overload.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.cp/rvalue-ref-overload.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.cp/rvalue-ref-overload.exp	2019-12-10 01:49:26.000000000 +0000
@@ -66,3 +66,7 @@ gdb_test "print f (ci)" "2" "lvalue refe
 
 setup_kfail "c++/15372" "*-*-*"
 gdb_test "print f (3)" "3" "rvalue reference overload"
+
+gdb_test "print g (i)" \
+    "Cannot resolve function g to any overloaded instance" \
+    "passing lvalue arg to rvalue parameter"
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/derived-type-striding.exp ./gdb/testsuite/gdb.fortran/derived-type-striding.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/derived-type-striding.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.fortran/derived-type-striding.exp	2019-12-10 01:49:27.000000000 +0000
@@ -20,6 +20,10 @@ if {[skip_fortran_tests]} { return -1 }
 
 standard_testfile ".f90"
 
+# Unfortunately recent versions of GCC broke the stride information in
+# the DEBUG so tests in this file will fail.
+set gcc_with_broken_stride [test_compiler_info {gcc-[89]-*}]
+
 if {[prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
 	 {debug f90}]} {
     return -1
@@ -31,7 +35,9 @@ if {![runto [gdb_get_line_number "post_i
 }
 
 # Test homogeneous derived type.
+if { $gcc_with_broken_stride } { setup_kfail *-*-* gcc/92775 }
 gdb_test "p point_dimension" "= \\\(2, 2, 2, 2, 2, 2, 2, 2, 2\\\)"
 
 # Test mixed type derived type.
+if { $gcc_with_broken_stride } { setup_kfail *-*-* gcc/92775 }
 gdb_test "p point_mixed_dimension" "= \\\(3, 3, 3, 3\\\)"
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/info-modules.exp ./gdb/testsuite/gdb.fortran/info-modules.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/info-modules.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.fortran/info-modules.exp	2019-12-10 01:49:27.000000000 +0000
@@ -17,6 +17,7 @@
 # module variables'.
 
 load_lib "fortran.exp"
+load_lib "sym-info-cmds.exp"
 
 if { [skip_fortran_tests] } { continue }
 
@@ -38,150 +39,130 @@ set real4 [fortran_real4]
 
 # Test 'info modules' command.
 
-gdb_test "info modules" \
-    [multi_line \
-	 "All defined modules:" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "18:\[\t \]+mod2" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "16:\[\t \]+mod1" ]
-
-gdb_test "info modules 1" \
-    [multi_line \
-	 "All modules matching regular expression \"1\":" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "16:\[\t \]+mod1" ]
-
-gdb_test "info modules 2" \
-    [multi_line \
-	 "All modules matching regular expression \"2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "18:\[\t \]+mod2" ]
-
-gdb_test "info modules mod" \
-    [multi_line \
-	 "All modules matching regular expression \"mod\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "18:\[\t \]+mod2" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "16:\[\t \]+mod1" ]
+GDBInfoSymbols::run_command "info modules"
+GDBInfoSymbols::check_header "All defined modules:"
+GDBInfoSymbols::check_entry "${srcfile2}" "18" "mod2"
+GDBInfoSymbols::check_entry "${srcfile}" "16" "mod1"
+GDBInfoSymbols::check_no_entry "${srcfile}"
+GDBInfoSymbols::check_no_entry "${srcfile2}"
+
+GDBInfoSymbols::run_command "info modules 1"
+GDBInfoSymbols::check_header \
+    "All modules matching regular expression \"1\":"
+GDBInfoSymbols::check_entry "${srcfile}" "16" "mod1"
+GDBInfoSymbols::check_no_entry "${srcfile}"
+GDBInfoSymbols::check_no_entry "${srcfile2}"
+
+GDBInfoSymbols::run_command "info modules 2"
+GDBInfoSymbols::check_header \
+    "All modules matching regular expression \"2\":"
+GDBInfoSymbols::check_entry "${srcfile2}" "18" "mod2"
+GDBInfoSymbols::check_no_entry "${srcfile}"
+GDBInfoSymbols::check_no_entry "${srcfile2}"
+
+GDBInfoSymbols::run_command "info modules mod"
+GDBInfoSymbols::check_header \
+    "All modules matching regular expression \"mod\":"
+GDBInfoSymbols::check_entry "${srcfile2}" "18" "mod2"
+GDBInfoSymbols::check_entry "${srcfile}" "16" "mod1"
+GDBInfoSymbols::check_no_entry "${srcfile}"
+GDBInfoSymbols::check_no_entry "${srcfile2}"
 
 # Test 'info module functions'.
 
-gdb_test "info module functions" \
-    [multi_line \
-	 "All functions in all modules:" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "22:\[\t \]+void mod2::sub_m2_a\\(${integer4}, ${logical4}\\);" \
-	 "30:\[\t \]+${logical4} mod2::sub_m2_b\\(${real4}\\);" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "35:\[\t \]+void mod1::__copy_mod1_M1t1\\(Type m1t1, Type m1t1\\);" \
-	 "25:\[\t \]+void mod1::sub_m1_a\\(${integer4}\\);" \
-	 "31:\[\t \]+${integer4} mod1::sub_m1_b\\(void\\);" ]
-
-gdb_test "info module functions -m mod1" \
-    [multi_line \
-	 "All functions in all modules matching regular expression \"mod1\":" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*:" \
-	 "35:\[\t \]+void mod1::__copy_mod1_M1t1\\(Type m1t1, Type m1t1\\);" \
-	 "25:\[\t \]+void mod1::sub_m1_a\\(${integer4}\\);" \
-	 "31:\[\t \]+${integer4} mod1::sub_m1_b\\(void\\);" ]
-
-gdb_test "info module functions -t integer" \
-    [multi_line \
-	 "All functions with type matching regular expression \"integer\" in all modules:" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "22:\[\t \]+void mod2::sub_m2_a\\(${integer4}, ${logical4}\\);" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "25:\[\t \]+void mod1::sub_m1_a\\(${integer4}\\);" \
-	 "31:\[\t \]+${integer4} mod1::sub_m1_b\\(void\\);" ]
+GDBInfoModuleSymbols::run_command "info module functions"
+GDBInfoModuleSymbols::check_header "All functions in all modules:"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "22" \
+    "void mod2::sub_m2_a\\(${integer4}, ${logical4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "30" \
+    "${logical4} mod2::sub_m2_b\\(${real4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "35" \
+    "void mod1::__copy_mod1_M1t1\\(Type m1t1, Type m1t1\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "25" \
+    "void mod1::sub_m1_a\\(${integer4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "31" \
+    "${integer4} mod1::sub_m1_b\\(void\\);"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module functions -m mod1"
+GDBInfoModuleSymbols::check_header \
+    "All functions in all modules matching regular expression \"mod1\":"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "35" \
+    "void mod1::__copy_mod1_M1t1\\(Type m1t1, Type m1t1\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "25" \
+    "void mod1::sub_m1_a\\(${integer4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "31" \
+    "${integer4} mod1::sub_m1_b\\(void\\);"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module functions -t integer"
+GDBInfoModuleSymbols::check_header \
+    "All functions with type matching regular expression \"integer\" in all modules:"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "22" \
+    "void mod2::sub_m2_a\\(${integer4}, ${logical4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "25" \
+    "void mod1::sub_m1_a\\(${integer4}\\);"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "31" \
+    "${integer4} mod1::sub_m1_b\\(void\\);"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
 
 # Test 'info module variables'.
 
-gdb_test "info module variables" \
-    [multi_line \
-	 "All variables in all modules:" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "19:\[\t \]+${integer4} mod2::mod2_var_1;" \
-	 "20:\[\t \]+${real4} mod2::mod2_var_2;" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*${srcfile}:" \
-	 "35:\[\t \]+Type m1t1 mod1::__def_init_mod1_M1t1;" \
-	 "35:\[\t \]+Type __vtype_mod1_M1t1 mod1::__vtab_mod1_M1t1;" \
-	 "21:\[\t \]+${real4} mod1::mod1_var_1;" \
-	 "22:\[\t \]+${integer4} mod1::mod1_var_2;" ]
-
-gdb_test "info module variables -t real" \
-    [multi_line \
-	 "All variables with type matching regular expression \"real\" in all modules:" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*:" \
-	 "20:\[\t \]+${real4} mod2::mod2_var_2;" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*:" \
-	 "21:\[\t \]+${real4} mod1::mod1_var_1;" ]
-
-gdb_test "info module variables -m mod2" \
-    [multi_line \
-	 "All variables in all modules matching regular expression \"mod2\":" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "19:\[\t \]+${integer4} mod2::mod2_var_1;" \
-	 "20:\[\t \]+${real4} mod2::mod2_var_2;" ]
-
-gdb_test "info module variables -m mod2 -t real" \
-    [multi_line \
-	 "All variables with type matching regular expression \"real\"" \
-	 "	in all modules matching regular expression \"mod2\":" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*${srcfile2}:" \
-	 "20:\[\t \]+${real4} mod2::mod2_var_2;" ]
-
-gdb_test "info module variables _1" \
-    [multi_line \
-	 "All variables matching regular expression \"_1\" in all modules:" \
-	 "" \
-	 "Module \"mod2\":" \
-	 "" \
-	 "File .*:" \
-	 "19:\[\t \]+${integer4} mod2::mod2_var_1;" \
-	 "" \
-	 "Module \"mod1\":" \
-	 "" \
-	 "File .*:" \
-	 "21:\[\t \]+${real4} mod1::mod1_var_1;" ]
+GDBInfoModuleSymbols::run_command "info module variables"
+GDBInfoModuleSymbols::check_header "All variables in all modules:"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "19" \
+    "${integer4} mod2::mod2_var_1;"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "20" \
+    "${real4} mod2::mod2_var_2;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "35" \
+    "Type m1t1 mod1::__def_init_mod1_M1t1;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "35" \
+    "Type __vtype_mod1_M1t1 mod1::__vtab_mod1_M1t1;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "21" \
+    "${real4} mod1::mod1_var_1;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "22" \
+    "${integer4} mod1::mod1_var_2;"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module variables -t real"
+GDBInfoModuleSymbols::check_header \
+    "All variables with type matching regular expression \"real\" in all modules:"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "20" \
+    "${real4} mod2::mod2_var_2;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "21" \
+    "${real4} mod1::mod1_var_1;"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module variables -m mod2"
+GDBInfoModuleSymbols::check_header \
+    "All variables in all modules matching regular expression \"mod2\":"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "19" \
+    "${integer4} mod2::mod2_var_1;"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "20" \
+    "${real4} mod2::mod2_var_2;"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module variables -m mod2 -t real"
+GDBInfoModuleSymbols::check_header \
+    "All variables with type matching regular expression \"real\" in all modules matching regular expression \"mod2\":"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "20" \
+    "${real4} mod2::mod2_var_2;"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
+
+GDBInfoModuleSymbols::run_command "info module variables _1"
+GDBInfoModuleSymbols::check_header \
+    "All variables matching regular expression \"_1\" in all modules:"
+GDBInfoModuleSymbols::check_entry "${srcfile2}" "mod2" "19" \
+    "${integer4} mod2::mod2_var_1;"
+GDBInfoModuleSymbols::check_entry "${srcfile}" "mod1" "21" \
+    "${real4} mod1::mod1_var_1;"
+GDBInfoModuleSymbols::check_no_entry "${srcfile}" ".*"
+GDBInfoModuleSymbols::check_no_entry "${srcfile2}" ".*"
 
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/info-types.exp ./gdb/testsuite/gdb.fortran/info-types.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.fortran/info-types.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.fortran/info-types.exp	2019-12-10 01:49:27.000000000 +0000
@@ -16,6 +16,7 @@
 # This file tests 'info types' for some Fortran types.
 
 load_lib "fortran.exp"
+load_lib "sym-info-cmds.exp"
 
 if { [skip_fortran_tests] } { continue }
 
@@ -37,6 +38,18 @@ set logical4 [fortran_logical4]
 set character1 [fortran_character1]
 set real4 [fortran_real4]
 
+GDBInfoSymbols::run_command "info types"
+GDBInfoSymbols::check_header "All defined types:"
+
+GDBInfoSymbols::check_entry "${srcfile}" "" "${character1}"
+GDBInfoSymbols::check_entry "${srcfile}" "" "${integer4}"
+GDBInfoSymbols::check_entry "${srcfile}" "" "${logical4}"
+GDBInfoSymbols::check_entry "${srcfile}" "$decimal" "Type m1t1;"
+GDBInfoSymbols::check_entry "${srcfile}" "" "${real4}"
+GDBInfoSymbols::check_entry "${srcfile}" "37" "Type s1;"
+
+return 0
+
 gdb_test "info types" \
     [multi_line \
 	 "All defined types:" \
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.guile/scm-breakpoint.c ./gdb/testsuite/gdb.guile/scm-breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.guile/scm-breakpoint.c	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.guile/scm-breakpoint.c	2019-12-10 01:49:27.000000000 +0000
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see  <http://www.gnu.org/licenses/>.  */
 
+#ifdef USE_PROBES
+#include <sys/sdt.h>
+#endif
+
 int result = 0;
 
 int multiply (int i)
@@ -38,6 +42,9 @@ int main (int argc, char *argv[])
     {
       result += multiply (foo);  /* Break at multiply. */
       result += add (bar); /* Break at add. */
+#ifdef USE_PROBES
+      DTRACE_PROBE1 (test, result_updated, result);
+#endif
     }
 
   return 0; /* Break at end. */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.guile/scm-breakpoint.exp ./gdb/testsuite/gdb.guile/scm-breakpoint.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.guile/scm-breakpoint.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.guile/scm-breakpoint.exp	2019-12-10 01:49:27.000000000 +0000
@@ -499,6 +499,28 @@ proc test_bkpt_address {} {
 	".*Breakpoint ($decimal)+ at .*$srcfile, line ($decimal)+\."
 }
 
+proc test_bkpt_probe {} {
+    global decimal hex testfile srcfile
+
+    if { [prepare_for_testing "failed to prepare" ${testfile}-probes \
+	    ${srcfile} {additional_flags=-DUSE_PROBES}] } {
+	return -1
+    }
+
+    if ![gdb_guile_runto_main] then {
+	return
+    }
+
+    gdb_scm_test_silent_cmd \
+	"guile (define bp1 (make-breakpoint \"-probe test:result_updated\"))" \
+	"create probe breakpoint"
+
+    gdb_test \
+	"guile (register-breakpoint! bp1)" \
+	"Breakpoint $decimal at $hex" \
+	"register probe breakpoint"
+}
+
 test_bkpt_basic
 test_bkpt_deletion
 test_bkpt_cond_and_cmds
@@ -508,3 +530,4 @@ test_bkpt_internal
 test_bkpt_eval_funcs
 test_bkpt_registration
 test_bkpt_address
+test_bkpt_probe
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.mi/mi-fortran-modules.exp ./gdb/testsuite/gdb.mi/mi-fortran-modules.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.mi/mi-fortran-modules.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.mi/mi-fortran-modules.exp	2019-12-10 01:49:27.000000000 +0000
@@ -33,8 +33,15 @@ if {[mi_gdb_start]} {
 
 mi_run_to_main
 
+
+# Patterns to skip optional system modules that appear with later versions of GFortran.
+set system_modules_pattern \
+    "\{filename=\"\[^\"\]+/ieee/\[^/\]+\.F90\",fullname=\"\[^\"\]+\",symbols=\\\[(\[^\]\]+)\\\]\},"
+set system_module_symbols_pattern \
+    "\{module=\"\[^\"\]*ieee\[^\"\]*\",files=\\\[\{filename=\"\[^\"\]+\",fullname=\"\[^\"\]+\",symbols=\\\[\[^\]\]+\\\]\}\\\]\},"
+
 mi_gdb_test "101-symbol-info-modules" \
-    "101\\^done,symbols=\{debug=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"16\",name=\"mod1\"\},\{line=\"27\",name=\"mod2\"\}\\\]\},\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"16\",name=\"mod3\"\},\{line=\"32\",name=\"modmany\"\},\{line=\"41\",name=\"moduse\"\}\\\]\}\\\]\}" \
+    "101\\^done,symbols=\{debug=\\\[($system_modules_pattern)*\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"16\",name=\"mod1\"\},\{line=\"27\",name=\"mod2\"\}\\\]\},\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"16\",name=\"mod3\"\},\{line=\"32\",name=\"modmany\"\},\{line=\"41\",name=\"moduse\"\}\\\]\}\\\]\}" \
     "-symbol-info-modules"
 
 mi_gdb_test "102-symbol-info-modules --name mod\[123\]" \
@@ -48,8 +55,8 @@ mi_gdb_test "103-symbol-info-modules --n
 mi_gdb_test "104-symbol-info-module-functions" \
     [join \
      [list \
-      "104\\^done,symbols=\\\[\{module=\"mod1\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"21\",name=\"mod1::check_all\",type=\"void \\(void\\)\",description=\"void mod1::check_all\\(void\\);\"\}\\\]\}\\\]\},\{module=\"mod2\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"30\",name=\"mod2::check_var_i\",type=\"void \\(void\\)\",description=\"void mod2::check_var_i\\(void\\);\"\}\\\]\}\\\]\},\{module=\"mod3\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"21\",name=\"mod3::check_all\",type=\"void \\(void\\)\",description=\"void mod3::check_all\\(void\\);\"\},\{line=\"27\",name=\"mod3::check_mod2\",type=\"void \\(void\\)\",description=\"void mod3::check_mod2\\(void\\);\"\}\\\]\}\\\]\}," \
-	  "\{module=\"modmany\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"35\",name=\"modmany::check_some\",type=\"void \\(void\\)\",description=\"void modmany::check_some\\(void\\);\"\}\\\]\}\\\]\},\{module=\"moduse\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"44\",name=\"moduse::check_all\",type=\"void \\(void\\)\",description=\"void moduse::check_all\\(void\\);\"\},\{line=\"49\",name=\"moduse::check_var_x\",type=\"void \\(void\\)\",description=\"void moduse::check_var_x\\(void\\);\"\}\\\]\}\\\]\}\\\]" ] "" ] \
+      "104\\^done,symbols=\\\[(${system_module_symbols_pattern})*\{module=\"mod1\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"21\",name=\"mod1::check_all\",type=\"void \\(void\\)\",description=\"void mod1::check_all\\(void\\);\"\}\\\]\}\\\]\},\{module=\"mod2\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"30\",name=\"mod2::check_var_i\",type=\"void \\(void\\)\",description=\"void mod2::check_var_i\\(void\\);\"\}\\\]\}\\\]\},\{module=\"mod3\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"21\",name=\"mod3::check_all\",type=\"void \\(void\\)\",description=\"void mod3::check_all\\(void\\);\"\},\{line=\"27\",name=\"mod3::check_mod2\",type=\"void \\(void\\)\",description=\"void mod3::check_mod2\\(void\\);\"\}\\\]\}\\\]\}," \
+      "\{module=\"modmany\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"35\",name=\"modmany::check_some\",type=\"void \\(void\\)\",description=\"void modmany::check_some\\(void\\);\"\}\\\]\}\\\]\},\{module=\"moduse\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"44\",name=\"moduse::check_all\",type=\"void \\(void\\)\",description=\"void moduse::check_all\\(void\\);\"\},\{line=\"49\",name=\"moduse::check_var_x\",type=\"void \\(void\\)\",description=\"void moduse::check_var_x\\(void\\);\"\}\\\]\}\\\]\}\\\]" ] "" ] \
     "-symbol-info-module-functions"
 
 mi_gdb_test "105-symbol-info-module-functions --name _all" \
@@ -65,7 +72,7 @@ set int4 [fortran_int4]
 mi_gdb_test "107-symbol-info-module-variables" \
     [join \
      [list \
-      "107\\^done,symbols=\\\[\{module=\"mod1\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"18\",name=\"mod1::var_const\",type=\"$int4\",description=\"$int4 mod1::var_const;\"\},\{line=\"17\",name=\"mod1::var_i\",type=\"$int4\",description=\"$int4 mod1::var_i;\"\}\\\]\}\\\]\},\{module=\"mod2\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"28\",name=\"mod2::var_i\",type=\"$int4\",description=\"$int4 mod2::var_i;\"\}\\\]\}\\\]\}," \
+      "107\\^done,symbols=\\\[(${system_module_symbols_pattern})*\{module=\"mod1\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"18\",name=\"mod1::var_const\",type=\"$int4\",description=\"$int4 mod1::var_const;\"\},\{line=\"17\",name=\"mod1::var_i\",type=\"$int4\",description=\"$int4 mod1::var_i;\"\}\\\]\}\\\]\},\{module=\"mod2\",files=\\\[\{filename=\"\[^\"\]+$srcfile2\",fullname=\"\[^\"\]+$srcfile2\",symbols=\\\[\{line=\"28\",name=\"mod2::var_i\",type=\"$int4\",description=\"$int4 mod2::var_i;\"\}\\\]\}\\\]\}," \
 	  "\{module=\"mod3\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"18\",name=\"mod3::mod1\",type=\"$int4\",description=\"$int4 mod3::mod1;\"\},\{line=\"17\",name=\"mod3::mod2\",type=\"$int4\",description=\"$int4 mod3::mod2;\"\},\{line=\"19\",name=\"mod3::var_i\",type=\"$int4\",description=\"$int4 mod3::var_i;\"\}\\\]\}\\\]\},\{module=\"modmany\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"33\",name=\"modmany::var_a\",type=\"$int4\",description=\"$int4 modmany::var_a;\"\}," \
 	  "\{line=\"33\",name=\"modmany::var_b\",type=\"$int4\",description=\"$int4 modmany::var_b;\"\},\{line=\"33\",name=\"modmany::var_c\",type=\"$int4\",description=\"$int4 modmany::var_c;\"\},\{line=\"33\",name=\"modmany::var_i\",type=\"$int4\",description=\"$int4 modmany::var_i;\"\}\\\]\}\\\]\},\{module=\"moduse\",files=\\\[\{filename=\"\[^\"\]+$srcfile\",fullname=\"\[^\"\]+$srcfile\",symbols=\\\[\{line=\"42\",name=\"moduse::var_x\",type=\"$int4\",description=\"$int4 moduse::var_x;\"\},\{line=\"42\",name=\"moduse::var_y\",type=\"$int4\",description=\"$int4 moduse::var_y;\"\}\\\]\}\\\]\}\\\]" ] "" ] \
     "-symbol-info-module-variables"
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.python/py-breakpoint.c ./gdb/testsuite/gdb.python/py-breakpoint.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.python/py-breakpoint.c	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.python/py-breakpoint.c	2019-12-10 01:49:27.000000000 +0000
@@ -15,6 +15,10 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see  <http://www.gnu.org/licenses/>.  */
 
+#ifdef USE_PROBES
+#include <sys/sdt.h>
+#endif
+
 int result = 0;
 
 namespace foo_ns
@@ -46,6 +50,9 @@ int main (int argc, char *argv[])
     {
       result += multiply (foo);  /* Break at multiply. */
       result += add (bar); /* Break at add. */
+#ifdef USE_PROBES
+      DTRACE_PROBE1 (test, result_updated, result);
+#endif
     }
 
   return 0; /* Break at end. */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.python/py-breakpoint.exp ./gdb/testsuite/gdb.python/py-breakpoint.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/gdb.python/py-breakpoint.exp	2019-12-09 01:49:31.000000000 +0000
+++ ./gdb/testsuite/gdb.python/py-breakpoint.exp	2019-12-10 01:49:27.000000000 +0000
@@ -695,6 +695,25 @@ proc_with_prefix test_bkpt_qualified {} 
 	"-q in spec string and qualified false"
 }
 
+proc_with_prefix test_bkpt_probe {} {
+    global decimal hex testfile srcfile
+
+    if { [prepare_for_testing "failed to prepare" ${testfile}-probes \
+	    ${srcfile} {debug c++ additional_flags=-DUSE_PROBES}] } {
+	return -1
+    }
+
+    if ![runto_main] then {
+	fail "cannot run to main."
+	return 0
+    }
+
+    gdb_test \
+	"python gdb.Breakpoint(\"-probe test:result_updated\")" \
+	"Breakpoint $decimal at $hex" \
+	"-probe in spec string"
+}
+
 test_bkpt_basic
 test_bkpt_deletion
 test_bkpt_cond_and_cmds
@@ -708,3 +727,4 @@ test_bkpt_pending
 test_bkpt_events
 test_bkpt_explicit_loc
 test_bkpt_qualified
+test_bkpt_probe
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/lib/sym-info-cmds.exp ./gdb/testsuite/lib/sym-info-cmds.exp
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/gdb/testsuite/lib/sym-info-cmds.exp	1970-01-01 00:00:00.000000000 +0000
+++ ./gdb/testsuite/lib/sym-info-cmds.exp	2019-12-10 01:49:27.000000000 +0000
@@ -0,0 +1,507 @@
+# Copyright 2019 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make it easier to run the 'info modules' command (using
+# GDBInfoModules), and the 'info module ...' commands (using
+# GDBInfoModuleContents) and process the output.
+#
+# The difficulty we run into is that different versions of gFortran
+# include different helper modules which show up in the results.  The
+# procedures in this library help process those parts of the output we
+# actually want to check, while ignoring those parts that we don't
+# care about.
+#
+# For each namespace GDBInfoModules and GDBInfoModuleContents, there's
+# a run_command proc, use this to run a command and capture the
+# output.  Then make calls to check_header, check_entry, and
+# check_no_entry to ensure the output was as expected.
+
+namespace eval GDBInfoSymbols {
+
+    # A string that is the header printed by GDB immediately after the
+    # 'info [modules|types|functions|variables]' command has been issued.
+    variable _header
+
+    # A list of entries extracted from the output of the command.
+    # Each entry is a filename, a line number, and the rest of the
+    # text describing the entry.  If an entry has no line number then
+    # it is replaced with the text NONE.
+    variable _entries
+
+    # The string that is the complete last command run.
+    variable _last_command
+
+    # Add a new entry to the _entries list.
+    proc _add_entry { filename lineno text } {
+	variable _entries
+
+	set entry [list $filename $lineno $text]
+	lappend _entries $entry
+    }
+
+    # Run the 'info modules' command, passing ARGS as extra arguments
+    # to the command.  Process the output storing the results within
+    # the variables in this namespace.
+    #
+    # The results of any previous call to run_command are discarded
+    # when this is called.
+    proc run_command { cmd { testname "" } } {
+	global gdb_prompt
+
+	variable _header
+	variable _entries
+	variable _last_command
+
+	if {![regexp -- "^info (modules|types|variables|functions)" $cmd]} {
+	    perror "invalid command"
+	}
+
+	set _header ""
+	set _entries [list]
+	set _last_command $cmd
+
+	if { $testname == "" } {
+	    set testname $cmd
+	}
+
+	send_gdb "$cmd\n"
+	gdb_expect {
+	    -re "^$cmd\r\n" {
+		# Match the original command echoed back to us.
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	gdb_expect {
+	    -re "^\r\n" {
+		# Found the blank line after the header, we're done
+		# parsing the header now.
+	    }
+	    -re "^\[ \t]*(\[^\r\n\]+)\r\n" {
+		set str $expect_out(1,string)
+		if { $_header == "" } {
+		    set _header $str
+		} else {
+		    set _header "$_header $str"
+		}
+		exp_continue
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	set current_file ""
+	gdb_expect {
+	    -re "^File (\[^\r\n\]+):\r\n" {
+		set current_file $expect_out(1,string)
+		exp_continue
+	    }
+	    -re "^(\[0-9\]+):\[ \t\]+(\[^\r\n\]+)\r\n" {
+		set lineno $expect_out(1,string)
+		set text $expect_out(2,string)
+		if { $current_file == "" } {
+		    fail "$testname (missing filename)"
+		    return 0
+		}
+		_add_entry $current_file $lineno $text
+		exp_continue
+	    }
+	    -re "^\[ \t\]+(\[^\r\n\]+)\r\n" {
+		set lineno "NONE"
+		set text $expect_out(1,string)
+		if { $current_file == "" } {
+		    fail "$testname (missing filename)"
+		    return 0
+		}
+		_add_entry $current_file $lineno $text
+		exp_continue
+	    }
+	    -re "^\r\n" {
+		exp_continue
+	    }
+	    -re "^$gdb_prompt $" {
+		# All done.
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	pass $testname
+	return 1
+    }
+
+    # Check that the header held in _header matches PATTERN.  Use
+    # TESTNAME as the name of the test, or create a suitable default
+    # test name based on the last command.
+    proc check_header { pattern { testname "" } } {
+	variable _header
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname "$_last_command: check header"
+	}
+
+	gdb_assert {[regexp -- $pattern $_header]} $testname
+    }
+
+    # Check that we have an entry in _entries matching FILENAME,
+    # LINENO, and TEXT.  If LINENO is the empty string it is replaced
+    # with the string NONE in order to match a similarly missing line
+    # number in the output of the command.
+    #
+    # TESTNAME is the name of the test, or a default will be created
+    # based on the last command run and the arguments passed here.
+    #
+    # If a matching entry is found then it is removed from the
+    # _entries list, this allows us to check for duplicates using the
+    # check_no_entry call.
+    proc check_entry { filename lineno text { testname "" } } {
+	variable _entries
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname \
+		"$_last_command: check for entry '$filename', '$lineno', '$text'"
+	}
+
+	if { $lineno == "" } {
+	    set lineno "NONE"
+	}
+
+	set new_entries [list]
+
+	set found_match 0
+	foreach entry $_entries {
+
+	    if {!$found_match} {
+		set f [lindex $entry 0]
+		set l [lindex $entry 1]
+		set t [lindex $entry 2]
+		if { [regexp -- $filename $f] \
+			 && [regexp -- $lineno $l] \
+			 && [regexp -- $text $t] } {
+		    set found_match 1
+		} else {
+		    lappend new_entries $entry
+		}
+	    } else {
+		lappend new_entries $entry
+	    }
+	}
+
+	set _entries $new_entries
+	gdb_assert { $found_match } $testname
+    }
+
+    # Check that there is no entry in the _entries list matching
+    # FILENAME, LINENO, and TEXT.  The LINENO and TEXT are optional,
+    # and will be replaced with '.*' if missing.
+    #
+    # If LINENO is the empty string then it will be replaced with the
+    # string NONE in order to match against missing line numbers in
+    # the output of the command.
+    #
+    # TESTNAME is the name of the test, or a default will be built
+    # from the last command run and the arguments passed here.
+    #
+    # This can be used after a call to check_entry to ensure that
+    # there are no further matches for a particular file in the
+    # output.
+    proc check_no_entry { filename { lineno ".*" } { text ".*" } \
+			      { testname "" } } {
+	variable _entries
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname \
+		"$_last_command: check no matches for '$filename', $lineno', and '$text'"
+	}
+
+	if { $lineno == "" } {
+	    set lineno "NONE"
+	}
+
+	foreach entry $_entries {
+	    set f [lindex $entry 0]
+	    set l [lindex $entry 1]
+	    set t [lindex $entry 2]
+	    if { [regexp -- $filename $f] \
+		     && [regexp -- $lineno $l] \
+		     && [regexp -- $text $t] } {
+		fail $testname
+	    }
+	}
+
+	pass $testname
+    }
+}
+
+
+namespace eval GDBInfoModuleSymbols {
+
+    # A string that is the header printed by GDB immediately after the
+    # 'info modules (variables|functions)' command has been issued.
+    variable _header
+
+    # A list of entries extracted from the output of the command.
+    # Each entry is a filename, a module name, a line number, and the
+    # rest of the text describing the entry.  If an entry has no line
+    # number then it is replaced with the text NONE.
+    variable _entries
+
+    # The string that is the complete last command run.
+    variable _last_command
+
+    # Add a new entry to the _entries list.
+    proc _add_entry { filename module lineno text } {
+	variable _entries
+
+	set entry [list $filename $module $lineno $text]
+	lappend _entries $entry
+    }
+
+    # Run the 'info module ....' command, passing ARGS as extra
+    # arguments to the command.  Process the output storing the
+    # results within the variables in this namespace.
+    #
+    # The results of any previous call to run_command are discarded
+    # when this is called.
+    proc run_command { cmd { testname "" } } {
+	global gdb_prompt
+
+	variable _header
+	variable _entries
+	variable _last_command
+
+	if {![regexp -- "^info module (variables|functions)" $cmd]} {
+	    perror "invalid command: '$cmd'"
+	}
+
+	set _header ""
+	set _entries [list]
+	set _last_command $cmd
+
+	if { $testname == "" } {
+	    set testname $cmd
+	}
+
+	send_gdb "$cmd\n"
+	gdb_expect {
+	    -re "^$cmd\r\n" {
+		# Match the original command echoed back to us.
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	gdb_expect {
+	    -re "^\r\n" {
+		# Found the blank line after the header, we're done
+		# parsing the header now.
+	    }
+	    -re "^\[ \t\]*(\[^\r\n\]+)\r\n" {
+		set str $expect_out(1,string)
+		if { $_header == "" } {
+		    set _header $str
+		} else {
+		    set _header "$_header $str"
+		}
+		exp_continue
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	set current_module ""
+	set current_file ""
+	gdb_expect {
+	    -re "^Module \"(\[^\"\]+)\":\r\n" {
+		set current_module $expect_out(1,string)
+		exp_continue
+	    }
+	    -re "^File (\[^\r\n\]+):\r\n" {
+		if { $current_module == "" } {
+		    fail "$testname (missing module)"
+		    return 0
+		}
+		set current_file $expect_out(1,string)
+		exp_continue
+	    }
+	    -re "^(\[0-9\]+):\[ \t\]+(\[^\r\n\]+)\r\n" {
+		set lineno $expect_out(1,string)
+		set text $expect_out(2,string)
+		if { $current_module == "" } {
+		    fail "$testname (missing module)"
+		    return 0
+		}
+		if { $current_file == "" } {
+		    fail "$testname (missing filename)"
+		    return 0
+		}
+		_add_entry $current_file $current_module \
+		    $lineno $text
+		exp_continue
+	    }
+	    -re "^\[ \t\]+(\[^\r\n\]+)\r\n" {
+		set lineno "NONE"
+		set text $expect_out(1,string)
+		if { $current_module == "" } {
+		    fail "$testname (missing module)"
+		    return 0
+		}
+		if { $current_file == "" } {
+		    fail "$testname (missing filename)"
+		    return 0
+		}
+		_add_entry $current_file $current_module \
+		    $lineno $text
+		exp_continue
+	    }
+	    -re "^\r\n" {
+		exp_continue
+	    }
+	    -re "^$gdb_prompt $" {
+		# All done.
+	    }
+	    timeout {
+		fail "$testname (timeout)"
+		return 0
+	    }
+	}
+
+	pass $testname
+	return 1
+    }
+
+    # Check that the header held in _header matches PATTERN.  Use
+    # TESTNAME as the name of the test, or create a suitable default
+    # test name based on the last command.
+    proc check_header { pattern { testname "" } } {
+	variable _header
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname "$_last_command: check header"
+	}
+
+	gdb_assert {[regexp -- $pattern $_header]} $testname
+    }
+
+    # Check that we have an entry in _entries matching FILENAME,
+    # MODULE, LINENO, and TEXT.  If LINENO is the empty string it is
+    # replaced with the string NONE in order to match a similarly
+    # missing line number in the output of the command.
+    #
+    # TESTNAME is the name of the test, or a default will be created
+    # based on the last command run and the arguments passed here.
+    #
+    # If a matching entry is found then it is removed from the
+    # _entries list, this allows us to check for duplicates using the
+    # check_no_entry call.
+    proc check_entry { filename module lineno text { testname "" } } {
+	variable _entries
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname \
+		"$_last_command: check for entry '$filename', '$lineno', '$text'"
+	}
+
+	if { $lineno == "" } {
+	    set lineno "NONE"
+	}
+
+	set new_entries [list]
+
+	set found_match 0
+	foreach entry $_entries {
+
+	    if {!$found_match} {
+		set f [lindex $entry 0]
+		set m [lindex $entry 1]
+		set l [lindex $entry 2]
+		set t [lindex $entry 3]
+		if { [regexp -- $filename $f] \
+			 && [regexp -- $module $m] \
+			 && [regexp -- $lineno $l] \
+			 && [regexp -- $text $t] } {
+		    set found_match 1
+		} else {
+		    lappend new_entries $entry
+		}
+	    } else {
+		lappend new_entries $entry
+	    }
+	}
+
+	set _entries $new_entries
+	gdb_assert { $found_match } $testname
+    }
+
+    # Check that there is no entry in the _entries list matching
+    # FILENAME, MODULE, LINENO, and TEXT.  The LINENO and TEXT are
+    # optional, and will be replaced with '.*' if missing.
+    #
+    # If LINENO is the empty string then it will be replaced with the
+    # string NONE in order to match against missing line numbers in
+    # the output of the command.
+    #
+    # TESTNAME is the name of the test, or a default will be built
+    # from the last command run and the arguments passed here.
+    #
+    # This can be used after a call to check_entry to ensure that
+    # there are no further matches for a particular file in the
+    # output.
+    proc check_no_entry { filename module { lineno ".*" } \
+			      { text ".*" } { testname "" } } {
+	variable _entries
+	variable _last_command
+
+	if { $testname == "" } {
+	    set testname \
+		"$_last_command: check no matches for '$filename', $lineno', and '$text'"
+	}
+
+	if { $lineno == "" } {
+	    set lineno "NONE"
+	}
+
+	foreach entry $_entries {
+	    set f [lindex $entry 0]
+	    set m [lindex $entry 1]
+	    set l [lindex $entry 2]
+	    set t [lindex $entry 3]
+	    if { [regexp -- $filename $f] \
+		     && [regexp -- $module $m] \
+		     && [regexp -- $lineno $l] \
+		     && [regexp -- $text $t] } {
+		fail $testname
+	    }
+	}
+
+	pass $testname
+    }
+}
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/include/ChangeLog ./include/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/include/ChangeLog	2019-12-09 01:49:31.000000000 +0000
+++ ./include/ChangeLog	2019-12-10 01:49:27.000000000 +0000
@@ -1,3 +1,13 @@
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	PR 24960
+	* dis-asm.h (disassemble_free_target): Declare.
+
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	* dis-asm.h (struct disassemble_info): Delete insn_sets.
+	(INIT_DISASSEMBLE_INFO_NO_ARCH): Don't define.
+
 2019-12-05  Jan Beulich  <jbeulich@suse.com>
 
 	* opcode/aarch64.h (AARCH64_FEATURE_CRYPTO): Expand to the
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/include/dis-asm.h ./include/dis-asm.h
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/include/dis-asm.h	2019-12-09 01:49:31.000000000 +0000
+++ ./include/dis-asm.h	2019-12-10 01:49:27.000000000 +0000
@@ -78,11 +78,6 @@ typedef struct disassemble_info
   enum bfd_endian endian;
   /* Endianness of code, for mixed-endian situations such as ARM BE8.  */
   enum bfd_endian endian_code;
-  /* An arch/mach-specific bitmask of selected instruction subsets, mainly
-     for processors with run-time-switchable instruction sets.  The default,
-     zero, means that there is no constraint.  CGEN-based opcodes ports
-     may use ISA_foo masks.  */
-  void *insn_sets;
 
   /* Some targets need information about the current section to accurately
      display insns.  If this is NULL, the target disassembler function
@@ -330,7 +325,10 @@ extern disassembler_ftype disassembler (
 
 /* Amend the disassemble_info structure as necessary for the target architecture.
    Should only be called after initialising the info->arch field.  */
-extern void disassemble_init_for_target (struct disassemble_info * dinfo);
+extern void disassemble_init_for_target (struct disassemble_info *);
+
+/* Tidy any memory allocated by targets, such as info->private_data.  */
+extern void disassemble_free_target (struct disassemble_info *);
 
 /* Document any target specific options available from the disassembler.  */
 extern void disassembler_usage (FILE *);
@@ -394,9 +392,6 @@ extern void init_disassemble_info (struc
 /* For compatibility with existing code.  */
 #define INIT_DISASSEMBLE_INFO(INFO, STREAM, FPRINTF_FUNC) \
   init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
-#define INIT_DISASSEMBLE_INFO_NO_ARCH(INFO, STREAM, FPRINTF_FUNC) \
-  init_disassemble_info (&(INFO), (STREAM), (fprintf_ftype) (FPRINTF_FUNC))
-
 
 #ifdef __cplusplus
 }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/md5.sum ./md5.sum
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/md5.sum	2019-12-09 01:53:33.000000000 +0000
+++ ./md5.sum	2019-12-10 01:53:37.000000000 +0000
@@ -36,7 +36,7 @@ a8bf329c24203303d1343c3eed58c07b  bfd/el
 5cb0eef365977eb8c7430c04738a9e2c  bfd/wasm-module.c
 ce93ef6cd4c0ba0799b9d6d75b36638a  bfd/elf64-mips.c
 c4d082a9c0c27456afe3357c4987b675  bfd/cpu-m9s12x.c
-6088051fa0756dfd8bc67baf40abde19  bfd/version.h
+3f6476259991df361c310ca5d5863d34  bfd/version.h
 f635e95e06957e744083b2160029e168  bfd/cpu-tilegx.c
 f2af796af1efd1971472837a26010b6f  bfd/coff-mcore.c
 89637e92fbef834ef0c545805106bcc4  bfd/cpu-avr.c
@@ -878,7 +878,7 @@ a4924125913c496d495ae2e685e139c4  gdb/py
 19b481f913074a213b2dd1164bb58a1d  gdb/python/py-stopevent.c
 1e0f6a7364c21c01ec4134915e064a0d  gdb/python/python.h
 f1042d8229b84413ea2487c3c6ba6e40  gdb/python/py-signalevent.c
-ba859ead70990006fc90e0b42b4bcb61  gdb/python/py-breakpoint.c
+8f6f9599f5388eef9bcf4d54c0861de1  gdb/python/py-breakpoint.c
 d262230254a03b37628d51ce9dd07956  gdb/python/py-newobjfileevent.c
 45407a8f22e38332b27fbcfd47e34ac3  gdb/python/py-param.c
 1f4e9c6528d73fba26a0a374db1023f2  gdb/python/py-varobj.c
@@ -1158,7 +1158,7 @@ f971d36e35ec0c3fce64b819d7891f15  gdb/Ch
 ab960dd28873265f19e9a83458aa498e  gdb/rl78-tdep.c
 aa2a7f6fd9f90abd11c4788816931fa6  gdb/i386-sol2-tdep.c
 f0f0f42873330be830a2ed8ee825e2bc  gdb/frame.h
-cf7a4b2f598a72e543dd03779502a87f  gdb/darwin-nat.c
+79ff19cc2bac7ab2a7435c28252656d3  gdb/darwin-nat.c
 cd48a447305aa41ba9525cdf1cdbc876  gdb/symfile-debug.c
 bd803d570c171081a07a26dc11df213a  gdb/stack.c
 dceecd1f6b79c70b072c20fe1322e39f  gdb/ser-tcp.c
@@ -1512,7 +1512,7 @@ e5803325cf92401f3a7638513c2c4639  gdb/te
 4195d3718293b642b8ead0ca9e2e1448  gdb/testsuite/gdb.cp/nsusing.cc
 f6f98a1cd66f0c2a9e1be299c914bf47  gdb/testsuite/gdb.cp/align.exp
 0a1de27ae133d3d51404caa05c9c59e0  gdb/testsuite/gdb.cp/demangle.exp
-1c1aa4330868952b5dd52de24254535f  gdb/testsuite/gdb.cp/rvalue-ref-overload.cc
+aee3eda71ea3781db5c61c32559f7c19  gdb/testsuite/gdb.cp/rvalue-ref-overload.cc
 d6ed226431adc34de1f41f2c2bc2168a  gdb/testsuite/gdb.cp/overload.cc
 eec8d6f0d95309501de1537ecc22af8a  gdb/testsuite/gdb.cp/destrprint.exp
 5ab1dc11161266de97c8c541e83f9137  gdb/testsuite/gdb.cp/ref-params.exp
@@ -1692,7 +1692,7 @@ fa68c66356324fc27903bd0b487b5727  gdb/te
 5aa100b253777f14d000cbac2d0a5c31  gdb/testsuite/gdb.cp/namespace-nested-import.cc
 1b230ab8da1b477237f0e769d5bd1af3  gdb/testsuite/gdb.cp/operator.cc
 02176d52bd4fef7223ffe44feabf3540  gdb/testsuite/gdb.cp/minsym-fallback.cc
-f16f0ae64fdc106ae64db537f085df0f  gdb/testsuite/gdb.cp/rvalue-ref-overload.exp
+42af395c5b5371192f33d0df12c7febc  gdb/testsuite/gdb.cp/rvalue-ref-overload.exp
 b4e27711f6e1b4b16df591b4acd7bdf1  gdb/testsuite/gdb.cp/hang3.cc
 feb819b43dbe4b5c8af03a9f050c6d04  gdb/testsuite/gdb.cp/virtbase.cc
 5eebbdbf1092b43b40e5ff4130959eb4  gdb/testsuite/gdb.cp/virtfunc.cc
@@ -1883,7 +1883,7 @@ aa72c9eeb4f4d7034731458617b8303e  gdb/te
 3b642b7e4302fbf6bf56235e6ccc7e00  gdb/testsuite/gdb.mi/new-ui-mi-sync.exp
 e7cb20e68fc6bb8dfaf4a51dd9cad8da  gdb/testsuite/gdb.mi/pr11022.c
 3dc1b104660ab4c437b5d8eee5ba1760  gdb/testsuite/gdb.mi/dw2-ref-missing-frame-func.c
-3bac3e9c71cab514d805e173fd5724b6  gdb/testsuite/gdb.mi/mi-fortran-modules.exp
+872507c4c1f23f5822186fd7eb936fcc  gdb/testsuite/gdb.mi/mi-fortran-modules.exp
 dafea5ce5b67848d17781aba9106a646  gdb/testsuite/gdb.mi/mi-until.exp
 6f3f75b9ab538b2e2c0c265c84df43ce  gdb/testsuite/gdb.mi/mi-linespec-err-cp.cc
 6fae9a7302efd1408dead21e8aa07364  gdb/testsuite/gdb.mi/mi-async-run.exp
@@ -2003,7 +2003,7 @@ b4eaa369534fd4c330f78a6780626c09  gdb/te
 2e2ca1bae1e37f98845fbd35d2c3acdc  gdb/testsuite/gdb.python/py-pp-re-notag.py
 bbe8bc9b865b04727e82f703863090e3  gdb/testsuite/gdb.python/py-symbol-2.c
 71fb884e1d6f19d19bf280180654e3e6  gdb/testsuite/gdb.python/py-nested-maps.c
-1bd54f94f422a43cfe7d4e28a21b4197  gdb/testsuite/gdb.python/py-breakpoint.exp
+55065198c15aa990f9126e256125a3aa  gdb/testsuite/gdb.python/py-breakpoint.exp
 7a1fe7bb453c826dd5a20e18a4c9e673  gdb/testsuite/gdb.python/py-linetable.exp
 08872fa36c197ae5f6fac367439156c2  gdb/testsuite/gdb.python/py-bad-printers.c
 2201fe232be56f834518596b4f09f9ce  gdb/testsuite/gdb.python/py-frame.c
@@ -2071,7 +2071,7 @@ bece49873340ace23d604e46cd75def5  gdb/te
 0daea34f6f525761460b543ed91e3e76  gdb/testsuite/gdb.python/py-pp-re-notag.c
 5d1951b4374b57b77d91de116ff3b490  gdb/testsuite/gdb.python/py-pp-registration.exp
 886d921550c59d823537fe9eec26b04f  gdb/testsuite/gdb.python/py-section-script.c
-28e18a3617468429a2a4e53e878160f3  gdb/testsuite/gdb.python/py-breakpoint.c
+c29b171b06fda5786ef0dd9a7b443470  gdb/testsuite/gdb.python/py-breakpoint.c
 b25123940ce653c48d9e97417c31446e  gdb/testsuite/gdb.python/py-breakpoint-create-fail.exp
 054efd4f65de6cc6cf5910e85df9af17  gdb/testsuite/gdb.python/py-recurse-unwind.exp
 12eddaec271994a3c45169b097f6787c  gdb/testsuite/gdb.python/py-pp-registration.py
@@ -3296,7 +3296,7 @@ eb1b11af62b865da0e1131c5c418b8e5  gdb/te
 5b4488b46dee8efd670abfdebe93e15d  gdb/testsuite/gdb.fortran/array-element.exp
 a1564a2c1d66cdbd4217c7c05a419ebc  gdb/testsuite/gdb.fortran/module.exp
 fda26f2bea70360a9c1abc10fd888605  gdb/testsuite/gdb.fortran/vla-history.exp
-e332c089e205284013b3fc5ce9455706  gdb/testsuite/gdb.fortran/info-types.exp
+f743748d249e12f2602327b342a2413a  gdb/testsuite/gdb.fortran/info-types.exp
 43e84b69e278b6cab6b7ba8e230addb6  gdb/testsuite/gdb.fortran/short-circuit-argument-list.f90
 e4632adc4901b89099a070569420467b  gdb/testsuite/gdb.fortran/vla-sizeof.exp
 89de9f1ea8d68ca58df32c1b36a3419e  gdb/testsuite/gdb.fortran/vla-datatypes.f90
@@ -3313,7 +3313,7 @@ a52244712b420c89de3d39536a18e14d  gdb/te
 23d5de4f34f6d0fc5fd33534baac6e63  gdb/testsuite/gdb.fortran/vla-sub.f90
 39bb8c8add5476e3ca38f5ee219ddb68  gdb/testsuite/gdb.fortran/common-block.f90
 894cd1c42cc4491dc48b6d6928e8575b  gdb/testsuite/gdb.fortran/exprs.exp
-a1eb647994f7aec7696a1bbb3cbb015e  gdb/testsuite/gdb.fortran/info-modules.exp
+b771a1093701cde85424d62e4de2d8e6  gdb/testsuite/gdb.fortran/info-modules.exp
 9ea552c1ea45f06c772c7e090e4c4bc4  gdb/testsuite/gdb.fortran/vla-ptype.exp
 8287b34a073eb0050f2da89e82baf1d2  gdb/testsuite/gdb.fortran/nested-funcs-2.f90
 088fc01d2a072fb3d78fcc1e90e52c9f  gdb/testsuite/gdb.fortran/vla-ptr-info.exp
@@ -3329,7 +3329,7 @@ b8fd51c608bff4b3c1b2180ee1de0ac3  gdb/te
 4cc009298304e303844c11db9fa0f206  gdb/testsuite/gdb.fortran/module.f90
 edc2f85e3f302e8a2ebe0e1a3ea201d1  gdb/testsuite/gdb.fortran/library-module-main.f90
 cdb6a59c77c3a104db50c725d286ae28  gdb/testsuite/gdb.fortran/ptr-indentation.exp
-8f7f90a99fe0409329bf8ae816a3606f  gdb/testsuite/gdb.fortran/derived-type-striding.exp
+62d624e8b6546389015facd5ffd9318e  gdb/testsuite/gdb.fortran/derived-type-striding.exp
 55340b24db8533984926072168e714eb  gdb/testsuite/gdb.fortran/max-depth.f90
 da855aaa95733876e7cfa169ad01977c  gdb/testsuite/analyze-racy-logs.py
 6d64dbc77bf895960b91ea27023f1790  gdb/testsuite/gdb.btrace/vdso.exp
@@ -4085,6 +4085,7 @@ b18f9c9b1f310ffe0298ec1b13f5d814  gdb/te
 2229bb11603ea3b0505514e3cc1c03d0  gdb/testsuite/lib/ada.exp
 b95dc2a351d65373861d5ccbc6f62d5c  gdb/testsuite/lib/opencl_kernel.cl
 955ce455baef4ea8405d2a9c324f36fc  gdb/testsuite/lib/compiler.c
+547bbf64fccfe8f8443d950bec310333  gdb/testsuite/lib/sym-info-cmds.exp
 3a88b98ce6c8c5d95fdd6b4c8984e2cb  gdb/testsuite/lib/pascal.exp
 3decac2fda2dfa0e19a40816183f065d  gdb/testsuite/lib/cl_util.c
 57805105071e24f65316f679f639df7a  gdb/testsuite/lib/range-stepping-support.exp
@@ -4453,7 +4454,7 @@ a73456a413ec206c45a1c05bede47b75  gdb/te
 3ae360ac3827f64fb894dcbec57961b3  gdb/testsuite/gdb.go/max-depth.go
 68d17058fa82304a192749f0eadc138d  gdb/testsuite/gdb.go/strings.go
 81b7ed6cb92c627d245bd2efc4b953b9  gdb/testsuite/gdb.go/methods.go
-b12fdc8c75ae46bc1a75344f3739abc0  gdb/testsuite/ChangeLog
+d99c6d97d02139c430af82a99786e6fe  gdb/testsuite/ChangeLog
 b3f11b21e5921c419a43f93720dedf85  gdb/testsuite/gdb.asm/empty.inc
 f2ba3acca1442df88b4c0ee97da94c54  gdb/testsuite/gdb.asm/asm-source.exp
 f1621bbbb2acbec5adef86d7d9549975  gdb/testsuite/gdb.asm/bfin.inc
@@ -4512,7 +4513,7 @@ e4d4db674514c0f5bdc218dde507d324  gdb/te
 80fcf02b29bf8ebfba0283103c18e370  gdb/testsuite/gdb.guile/scm-type.c
 64366a6f352ff8f611990c80180e6d30  gdb/testsuite/gdb.guile/types-module.exp
 16820bbf6bcc11f9137cce9c7f83897e  gdb/testsuite/gdb.guile/scm-section-script.exp
-1fe2d532477806d1cc242ec8705150cb  gdb/testsuite/gdb.guile/scm-breakpoint.exp
+3f64094f2eda84fead30ce54cbaf2691  gdb/testsuite/gdb.guile/scm-breakpoint.exp
 6ddecf28e0113958c6d6e541c138857c  gdb/testsuite/gdb.guile/scm-equal.exp
 3aa85f8710b5daa3b20bd3d252f894dd  gdb/testsuite/gdb.guile/scm-frame-inline.exp
 5218398a166be044915abe3c1233e16c  gdb/testsuite/gdb.guile/scm-pretty-print.scm
@@ -4535,7 +4536,7 @@ e383c73a2b546f73e913d56dbde92cfe  gdb/te
 06d36e423ae7e283c45cc049ea9dcc2f  gdb/testsuite/gdb.guile/scm-error.exp
 a2254a117757956fde444fe24338be10  gdb/testsuite/gdb.guile/scm-symtab.c
 41cf5792442917741ef07d7dc92cf5fd  gdb/testsuite/gdb.guile/scm-math.c
-4800813025294502f4dadfff435e2e40  gdb/testsuite/gdb.guile/scm-breakpoint.c
+aa20228db21553361f144f7ac5c4777f  gdb/testsuite/gdb.guile/scm-breakpoint.c
 b43d2d2db9da1be4557c14f8b23bbfa6  gdb/testsuite/gdb.guile/scm-cmd.exp
 fce56e09f6b6e71e0871530bd4f5c4c5  gdb/testsuite/gdb.guile/scm-symtab.exp
 3b6d0f129b6b44bcf7e98e76759a2e6e  gdb/testsuite/gdb.guile/scm-section-script.c
@@ -5288,44 +5289,44 @@ e80b03a7b7627b45d3215a1080f61615  gdb/sy
 518eeb650ede533c76597c3a1c3b5b5f  gdb/f-valprint.c
 b4661232e1c651351e7aab789eebdb61  gdb/gdb_curses.h
 8108dd8f906f2654fecc74958cf383db  gdb/doc/psrc.sed
-661bc6af527ae5a658972bbb523310f2  gdb/doc/gdb.info-3
-e39cc643cac847ccaae668527b80b7e8  gdb/doc/gdb.info-4
+d525ffe5314ef04630cada54df13693e  gdb/doc/gdb.info-3
+bbe1a0d295a2017a0aa76eba8d8da541  gdb/doc/gdb.info-4
 ab0fe311032294b952da80585b8b90e7  gdb/doc/fdl.texi
 5db562992b3f0178f803b66c2b2337fd  gdb/doc/Makefile.in
-90b3ac52f38fe344dbec61549d4936bd  gdb/doc/gdb.info-7
-50c60a6b378275994a44d9ecc5e82d88  gdb/doc/gdbserver.1
+039ca77797f764387a59832f05117060  gdb/doc/gdb.info-7
+3772ef2ae3303306603c80d2bdf22a8b  gdb/doc/gdbserver.1
 34e70c52a663f6a691f6ceb17e8b3e48  gdb/doc/guile.texi
 f81a0e00e0cb9e41b078069fb9bedb07  gdb/doc/stack_frame.txt
 a07e6b7f88c558d15d03adeeaca94c74  gdb/doc/stabs.info
-77fa752fc0bf7e4279aee1c84e3bb888  gdb/doc/gdb.info-5
-5d40b531d6638f5c456e991b59d0f559  gdb/doc/gdb.info-8
+014e00ad5a5d13f0c78df30722a7ede6  gdb/doc/gdb.info-5
+f33eebf73a7ea7738e94321cb15db07a  gdb/doc/gdb.info-8
 9137c9e47e1692b8efec8e28482aa6fb  gdb/doc/agentexpr.texi
 66674dc351ba95941f422dc18cae24bb  gdb/doc/.gitignore
-d8136b44989b2b0cc805799459e3b4a1  gdb/doc/gdb.info-1
+ff833244b2cec8d786f939864301eb16  gdb/doc/gdb.info-1
 d5d06eaf9b4d44aa442a4a281aa9aea4  gdb/doc/a4rc.sed
-c8400ce128260cac98575c12834c381a  gdb/doc/gdb.info-6
+113d5a83b056154137377d1df9cb7414  gdb/doc/gdb.info-6
 e56d1d100677e3f5949bacad8189c328  gdb/doc/gdb.texinfo
-890da461d8d35dd95acb2a6f27d1cb2a  gdb/doc/gdb-add-index.1
+6862a15786323978783d40d20f418510  gdb/doc/gdb-add-index.1
 553b7fe1bf4b5d8b96fdb8cd83503de1  gdb/doc/stack_frame.svg
 04c82b1da7e894a6555868e4f86225af  gdb/doc/filter-for-doxygen
 5a0374965ab816741c91c7eaea412912  gdb/doc/Doxyfile-gdb-api.in
 e41a962402414f62e2f16a22a2783703  gdb/doc/annotate.info
-81c2aaf6205d06b0cc367b62c83557f1  gdb/doc/gdb.info-2
+a69f5066145d3a78441353a459cecdb5  gdb/doc/gdb.info-2
 fdd79e6125e56c1eb7e28b2a71d5b48e  gdb/doc/refcard.tex
 6076d300a46651562d4ecd0604442414  gdb/doc/stack_frame.png
-578028b935cf0a865f76d537bd20c9a7  gdb/doc/gdb.info
+fda022f7d27464713ad4919165ad6317  gdb/doc/gdb.info
 8bb39bf41da6a03890e05a9ab1b373b9  gdb/doc/python.texi
 9927faec0d3464d1bc485cd0c69a4a46  gdb/doc/stabs.texinfo
 452fabbb30b88f1fc182fc8e5e31ba27  gdb/doc/ChangeLog
-b91ec09ce76918e8fdcc92007cb0aa9d  gdb/doc/gdb.1
-ce6154818c642cf6b080e527d10df4f6  gdb/doc/gcore.1
+b7b23c41e8510a22f983d219befce3bb  gdb/doc/gdb.1
+75595f9d460626b62f25ef82b09b2647  gdb/doc/gcore.1
 d39233c86ed6a6dc9e853ae6a11fe03e  gdb/doc/stack_frame.pdf
 cb7ea97486937341d6ae27968ee40d23  gdb/doc/Doxyfile-base.in
 29393ec87c7921291f54ee7b57ccb1d9  gdb/doc/all-cfg.texi
 bf96494e6e4d346175babd5ef9781882  gdb/doc/gpl.texi
 cd5e3faa9bd1b684a73c7d527cdb4988  gdb/doc/filter-params.pl
 7bfdb0765c5d050d204fbb30aeeba0d8  gdb/doc/stack_frame.eps
-903ad2f34583f26a8b0ced1b336bd60f  gdb/doc/gdbinit.5
+8e28dddcdba02f130ad60a0abe2fd0fa  gdb/doc/gdbinit.5
 24d4f8b6396da16d9a8dd98281ac40ff  gdb/doc/Doxyfile-gdb-xref.in
 6f3b23a5f42aba8cbac1bcf7329942e4  gdb/doc/annotate.texinfo
 0b3e26fe6db92700f1e51071ff475193  gdb/doc/doxy-index.in
@@ -5748,7 +5749,7 @@ cafa2250708089626ca79a97245b6610  gdb/va
 6af968a34afeb9eab9fd547e3fa65d62  gdb/solib-target.c
 7d40f66ff5bf4c4d11a2623bdc59f0ea  gdb/tilegx-tdep.c
 37fc98e9876223442e12822a3ba0166d  gdb/c-lang.h
-8a6f71f47026a95c69b267dd37698ed2  gdb/breakpoint.c
+ae6f3c3512d0a701159a52d9a8685e76  gdb/breakpoint.c
 861fa9a99aade88112f84c01fb0a3d03  gdb/block.h
 c622629ce98d348a92a1d82095ac28ee  gdb/type-stack.c
 95ed11db0f3cb80ed86362e2b3d8b479  gdb/s390-tdep.h
@@ -5760,7 +5761,7 @@ ff2b2264d3bc2c96926dca89c1596eff  gdb/pr
 dce587078c693a6ff096e9ac8c76f247  gdb/maint.c
 c086e7b7f948f2285c1cbb4d6656689c  gdb/x86-bsd-nat.h
 a8282658401449c6beef61c9f36f145b  gdb/moxie-tdep.c
-bf3c3ec5c0473b669b8c26b26e27eeb4  gdb/gdbtypes.c
+e6c0df08f646157de09b7821e371f857  gdb/gdbtypes.c
 c5ffbe634b4abf2108700a75ba62aa0f  gdb/ppc-obsd-nat.c
 11e488d83e18c4036892ff4450937c16  gdb/mips-nbsd-nat.c
 8de7206d485292751ca31a6de7590c3b  gdb/elfread.c
@@ -5835,7 +5836,7 @@ a88e31ebdc95dea2e182e90fa3596b09  gdb/va
 7242736b5bba9098c974d0e015b167a5  gdb/std-regs.c
 90d72be4c884a79ded08fa4fbbcb6b9b  gdb/go-lang.h
 9a1fd6216061720bf8556e23cf224721  gdb/i386-windows-nat.c
-74d2aee0c44148c831cdabbf33eeefcd  gdb/po/gdb.pot
+e0b6fc825fbdc7b1cd49f119c2524718  gdb/po/gdb.pot
 1851bff0653201a488dcae18dde7efad  gdb/po/gdbtext
 7da5f0db2eb697d3fb85524954abaef5  gdb/break-catch-syscall.c
 f7aa291f013990b620f171fbd5c9d9b2  gdb/ada-lang.c
@@ -5867,7 +5868,7 @@ e3e2430aebaf80b6aca6759cfa9612d4  gdb/nb
 0d4182edc7beb626c56d423668383a2b  gdb/i386-fbsd-nat.c
 094e893d632874e14e92917b8c57c5fd  gdb/mipsread.c
 d4e47464ef8b510c11c547fb163d603a  gdb/amd64-darwin-tdep.c
-b95fc92b0bb45c68d21c70f2941e089f  gdb/ChangeLog
+9619db76cc726c9d81b53b2622227100  gdb/ChangeLog
 2fd8f81fb260df7b31ffaaaa44e1d4b9  gdb/go-typeprint.c
 6bdae112ab8858c8b8eb3e32bc9b5b45  gdb/score-tdep.c
 170c97d0320940cea4fda1d1cb413687  gdb/xml-support.h
@@ -6029,7 +6030,7 @@ ae9224513045924d7aec6d566cad38c0  gdb/gu
 057da3ef458b7124db7472f2b54aed8e  gdb/guile/scm-symtab.c
 1b131b5d43861fb2c33633496c247e55  gdb/guile/scm-math.c
 3527b95d88b2e65b4646a4327c43d11f  gdb/guile/guile.h
-4af73e6ba4efbae07ac8f2c43a750ca3  gdb/guile/scm-breakpoint.c
+874d02f5649798850b3242686bf559e3  gdb/guile/scm-breakpoint.c
 5e426a5d280ef49ec8b3bde901601bd3  gdb/guile/scm-value.c
 d50f7d9cca622c30d947ad66ad134ef9  gdb/guile/scm-pretty-print.c
 285f10e406912bf3ca175288545ff491  gdb/guile/scm-disasm.c
@@ -6205,7 +6206,7 @@ ab547fc523d932c710785acb1950e83c  gdb/st
 8edc014e1b5928dd9761408fa7df0d64  gdb/stubs/sparc-stub.c
 140d077412ae615053b55e8cd29dfee2  gdb/stubs/sh-stub.c
 c40e87506f597a7943c5276b857d0684  gdb/buildsym.c
-0b599e8e57d09a54a7a57a90fb0e82d8  gdb/breakpoint.h
+ffcc2e5b1bb083aa858f572a9e1c4b84  gdb/breakpoint.h
 61f1bf956c005df7b7782007cb41d4d5  gdb/objfiles.c
 336df5aa02e0c34ca27f7c40a8731e7b  gdb/debug.c
 91a2751fd55fc5eee28d4ff5ed905e4a  gdb/sol2-tdep.h
@@ -7122,8 +7123,8 @@ ac5c6fe8de400c9792753b5db5b255d5  includ
 ae5154ba0c6bf41452c1e4e3938fde52  include/gdb/callback.h
 d3976907c9252ef4d60b9ac80987eafc  include/hashtab.h
 8673aa12a3493cb537f1220aa799b950  include/gcc-interface.h
-fc76120b53317084e8d534eee74161df  include/ChangeLog
-88586319cd45959f54a1776d5d769a05  include/dis-asm.h
+659b236c750a5b4fc1a277b4a621a4a7  include/ChangeLog
+97f05ae080143ddf6ff7fc58a26f07bd  include/dis-asm.h
 2e19107e7906229570c084b790923d48  include/splay-tree.h
 352ce75976e0a5970298d574ffdf743e  include/filenames.h
 a52df8b7759338542cfe73e56e69de97  include/symcat.h
@@ -7582,7 +7583,7 @@ cd7f298ea8c90ece6d6636caa2663922  opcode
 5cda21d9ce150e4ad3e2c100d548990a  opcodes/epiphany-ibld.c
 c5c2b41393a7be2985845e58b6c53467  opcodes/m10200-opc.c
 c825caabde2126bbbc946b16fb98e72c  opcodes/arc-ext.c
-571df8ee9b230b640fdedbb34676186d  opcodes/or1k-dis.c
+91e23bfdf37c646e6c3aec223f321d86  opcodes/or1k-dis.c
 eefb6b283c1f5f324ddc347cb0c1c5e0  opcodes/m32c-asm.c
 7e97fdd557f57096066757c05ddd3999  opcodes/mcore-opc.h
 80f77954e03c43da64f82b89d9c3473e  opcodes/crx-opc.c
@@ -7641,7 +7642,7 @@ ecc011ab263450df4c90156515e3e3e3  opcode
 5873d90c70d423548dfea27569c82865  opcodes/aarch64-opc-2.c
 5cd79bab2e3be29e79d6391f0be7da35  opcodes/fr30-opc.h
 dbd383d9a8cba4ee07270a0244966e8c  opcodes/m68k-opc.c
-20d19a5ef376d1784eb73bd23a4666e7  opcodes/m32c-dis.c
+f8aaaed8adc918ec92754712370b37a5  opcodes/m32c-dis.c
 43130c8fdf892ebedbb621b5010cdb56  opcodes/lm32-opc.c
 de5e932dd2f88ac5c2a0f1600bc06467  opcodes/makefile.vms
 1740f8cfbaa4123edf00b748d072b5ab  opcodes/h8300-dis.c
@@ -7675,7 +7676,7 @@ f345d22e618784b582142c4817d7be03  opcode
 74ffe5f8ffe7786e93729c50f53aa7c1  opcodes/mep-opc.c
 3f27e5d03b2bbdae9ace18719d890ee7  opcodes/or1k-ibld.c
 2616b3d6498b77a7b119c1b8ffc46dd7  opcodes/aarch64-tbl.h
-2c04d89fef4808c3a9f7c8442569fe4f  opcodes/epiphany-dis.c
+c4a01ac3a7bbcb19fb158d1f55b8632c  opcodes/epiphany-dis.c
 5d9eaad491c2454a0f4bd8e5e09ccae5  opcodes/pdp11-opc.c
 a53680ee35ecd26833d0155b16def898  opcodes/ChangeLog-2010
 5c0325665fea6f7ac350c2da238fca33  opcodes/lm32-opinst.c
@@ -7720,14 +7721,14 @@ c098c5cde9b3dc17ecf3f4f5626dc002  opcode
 5877ba5e080a7c281d631fa730cf3f50  opcodes/spu-opc.c
 4e6ec2c7f5ac51a0c6accd0d7268507c  opcodes/m32r-desc.h
 2e9da4352e621be7ea01ae505437718d  opcodes/xgate-opc.c
-58d0f8eaa5086ad1edf14d033d631da7  opcodes/ppc-dis.c
+d82f778486a2f3dad8ecc96f35afe6ae  opcodes/ppc-dis.c
 3b15094418dae0db7f120b454b9f47ba  opcodes/ia64-dis.c
 dc024d3b48a1df846b5ba8a9e3298ee9  opcodes/ft32-dis.c
 fa2e7775fb32f003537ff547c2d5bc7b  opcodes/z80-dis.c
 9f9ca231f303f26cc3b821b4a8fd9556  opcodes/tilegx-opc.c
 ce914fe9eed08941164781e2be28336b  opcodes/lm32-desc.c
-424e463343068b76fab4ab5ea38bb382  opcodes/xstormy16-dis.c
-0b37ada88ba8bbede8fe6f53c0306e55  opcodes/cgen-dis.in
+0de342db0b374e59ca6194ec8f3babc7  opcodes/xstormy16-dis.c
+97296566ea48acc07e4bb18906dce6e7  opcodes/cgen-dis.in
 491ce2b9d8011e43064bf96d1588e9c7  opcodes/mips-dis.c
 31362e43aab5733da5aa6b696822ec6a  opcodes/csky-dis.c
 39b7e834f46b8cf1879169b1f12c6ed3  opcodes/arc-regs.h
@@ -7740,7 +7741,7 @@ e90f5d03a7dd2d3bcf05962da4859f16  opcode
 9300bcc15a455fea2d4c7de9b64701aa  opcodes/or1k-opc.h
 d6cfc84911f97407c877e04595588cb5  opcodes/visium-dis.c
 1ded054093de910d9786c62bc4fe8cc6  opcodes/stamp-h.in
-a26f844e4d7213c8dc214f65b85466c6  opcodes/m32r-dis.c
+3ea3e635a3fab1b00949d21151da606a  opcodes/m32r-dis.c
 5b2aa21de3d58c9100b435d8ebbcdf65  opcodes/ia64-opc-a.c
 1bffa0774f1aa6079636b5bcefef8530  opcodes/score-opc.h
 438c4d03003e13dea319f84d29d8ff5a  opcodes/iq2000-desc.h
@@ -7756,7 +7757,7 @@ e07f158ef8a4325642192a58478181a8  opcode
 5eb782e20ab20691354ee292375b85bd  opcodes/ppc-opc.c
 28fb37aa7a8f837c00f28fa2617e090d  opcodes/d30v-dis.c
 6a7fc7a4fc6ea32798613e6ae5a00c29  opcodes/v850-dis.c
-59932f76a3ce1ba011678616a6871852  opcodes/mt-dis.c
+a8ccf732c1ab7a20608752490e0312e6  opcodes/mt-dis.c
 f4f7d155f29225a1a39bc5ba991d08f8  opcodes/i386-dis-evex-w.h
 b5c6b8bd0f1a6dd6ce064e362b47fb49  opcodes/ChangeLog-2016
 c5cefc6c55710567cc64c0a1a1100b9d  opcodes/ChangeLog-2014
@@ -7769,7 +7770,7 @@ d679d499a60c06d7cdb14aa5b211c0ec  opcode
 2e2a209db97e825ea60f38aa9071979d  opcodes/configure
 6cbf1fbb631097976d9c0c68bfe90387  opcodes/pj-opc.c
 237e54af83f0143bd2a6e7eb1b712eed  opcodes/bpf-desc.h
-4c2d4b7e53ddee31ba4b96db69eaad0e  opcodes/bpf-dis.c
+0dd1b3cfb652e0fe7672587cf0fefe33  opcodes/bpf-dis.c
 a6340db3e90d5c652c8c6e2462c101a0  opcodes/mep-opc.h
 aa3895af184ebb6d935b41fc89922e9e  opcodes/aclocal.m4
 dfb951b900a189002b3954ccb21c3ac4  opcodes/ia64-opc-d.c
@@ -7823,16 +7824,16 @@ f54be2e715ceb6cebb98fab5bc37e7db  opcode
 62a30cfb1b506ee2c3916ee13e9eda8a  opcodes/m10300-dis.c
 1b1854422db842d0dfa01c932a5f86ae  opcodes/nds32-opc.h
 713fb26f79662b078390d218dc5d977c  opcodes/aarch64-opc.h
-b435348e0f9b0f64d006007b6f7e1115  opcodes/ChangeLog
+90a02eed3f068f59429ad826609ee75b  opcodes/ChangeLog
 327cf11f5c08b578f3b0cdb7f3923280  opcodes/ia64-raw.tbl
-bd6d6d07bd75b0bc4ef5b8c67ca29532  opcodes/frv-dis.c
+aa7514b36d310f0d844b24155fa91b35  opcodes/frv-dis.c
 85afb5e9fa15ca375baadf5e1da1d13b  opcodes/aarch64-opc.c
 a0c6719f00408eb6e6075580e4d5a01a  opcodes/iq2000-ibld.c
 466aaf368e34323c679a1231a1255815  opcodes/dis-buf.c
 7979f0b0633dce05c5a59479d4ef6704  opcodes/s390-opc.txt
 f70ebbc0645dd4d36bcbfc84283e1790  opcodes/metag-dis.c
 cac154290bf824dbd9c8efb3b20ca6de  opcodes/m32r-opc.h
-b794e3f96605069a37ff9b2b70bb1f10  opcodes/mep-dis.c
+23f38d393554e090492f1bdacae99ae6  opcodes/mep-dis.c
 7d7d28737ff404f709104accbd7b7926  opcodes/ChangeLog-0203
 095033162e89f5f710ed6891dae375c7  opcodes/ia64-opc-x.c
 bc9cf729403d92b2815dc9c347b2cfe0  opcodes/mips-formats.h
@@ -7841,11 +7842,11 @@ bc9cf729403d92b2815dc9c347b2cfe0  opcode
 27d9c849353433d4e3fd10a76a6bc197  opcodes/frv-opc.h
 08c1c3f94b2e57654f2ef6a58fc7f5fa  opcodes/mt-asm.c
 04cbfc017d30a4828f33d6f5923ed4c8  opcodes/wasm32-dis.c
-141833764eabef4523c245ca3a57c975  opcodes/fr30-dis.c
+3de339ed6464a04fa4033ac06b5a4adc  opcodes/fr30-dis.c
 fd90d45321bd491542004915f1f35020  opcodes/i386-dis-evex.h
 27516f861e393d748f8fc2e352eb6b97  opcodes/arc-dis.h
 7390461b1a9ccc867bccec21fd69121a  opcodes/riscv-opc.c
-51395560752391d402b0bd2305a4e4a5  opcodes/xc16x-dis.c
+b1e27678214ec6733c0bacf20a3bb559  opcodes/xc16x-dis.c
 6ddcbd5446c1c731f798369c87951e2f  opcodes/epiphany-desc.c
 f7b8b18ab2b5f1cb03ab99b1cca821ef  opcodes/ChangeLog-2018
 9cfdae46f8255086bca20fbadd8892b0  opcodes/ia64-opc-f.c
@@ -7856,7 +7857,7 @@ f7b8b18ab2b5f1cb03ab99b1cca821ef  opcode
 db5af979acf8d7c971301b1ad9efaab1  opcodes/aarch64-asm.h
 58e924c52c2bfeef23d22c4f482edcfc  opcodes/ChangeLog-0001
 73db15620f2907676ab2d8923c6421c8  opcodes/rl78-decode.c
-cb8fdfa94a8fefb37113247f5e71a09e  opcodes/ip2k-dis.c
+9cfd19453ae2eb2dbba892557f512b50  opcodes/ip2k-dis.c
 16f3a170d6b704573bfd0788b4d1061e  opcodes/ChangeLog-2007
 e97749da9ab275b1746313452a10c86b  opcodes/nfp-dis.c
 9978b0ffb15f1ad48bc31816517ef965  opcodes/ChangeLog-2009
@@ -7880,7 +7881,7 @@ adc82b6da55150afc85422caac7c70cb  opcode
 adeaeade8ed2f992a18a9f086feb2284  opcodes/iq2000-asm.c
 b3fc6d39b8b8fc62a625e0649b1ef4b9  opcodes/aarch64-dis.c
 a3b3669c240344adf0664ca0c38cabcf  opcodes/epiphany-desc.h
-985609b5fa4099913abef3e148020e13  opcodes/disassemble.c
+524d5987e3e34a7f3f0136000e406214  opcodes/disassemble.c
 9d4adf3dfbfe2cfb10b8f2c0e86ebd68  opcodes/ip2k-desc.c
 48bd09ebbb27ea945bcea4aa1d4e8a80  opcodes/rx-decode.opc
 173bea22b3108dc0d46fc8a38d9ae33f  opcodes/MAINTAINERS
@@ -7901,17 +7902,17 @@ b0ca98da43e132fb38f0fb04258113e3  opcode
 332b132cc624651ca5dba866a879a304  opcodes/ip2k-opc.c
 bdabb101f1d0c544aef4513a77f1c32f  opcodes/sysdep.h
 e469ca05f8897c09344a3cf2bcbf4088  opcodes/tic30-dis.c
-c26d380e3665cbfb63d1c693bac8a506  opcodes/lm32-dis.c
+75148b05d124abf1cb8892f0c1bbdb0f  opcodes/lm32-dis.c
 ffd27e33415c11897a2b32d4253f8de3  opcodes/nds32-asm.h
 2b5a34a6f22860084dbe9ede9406cb6a  opcodes/xstormy16-asm.c
-0817d06e4a986c299b297c0e731d2955  opcodes/s12z-opc.c
+bb4577bc7f451e999f9560cffc60caca  opcodes/s12z-opc.c
 5375b7ee99c1c53b98e45888d2073260  opcodes/or1k-opc.c
 cc2157ffd475204b12be780a1e2683b8  opcodes/arc-ext.h
 9641b12f59bffc20c6bfbdfa700422ae  opcodes/i386-dis-evex-mod.h
 94f844a6e7ec8d1b7bb50e4282f01dfa  opcodes/csky-opc.h
 43510f6ba01d547fdac54a3c57eec613  opcodes/tic54x-opc.c
 f2218edb333177d243444b44a52f1954  opcodes/z8kgen.c
-bed4294704a95083f788a207484efa5f  opcodes/iq2000-dis.c
+0f9f03077699ca79b328ad137d948a9e  opcodes/iq2000-dis.c
 4dde640cda0b904d04364e9ad3801964  opcodes/frv-asm.c
 e6ff2779c4a5372ae18a4d5a49c31c69  readline/Makefile.in
 f8e5702e65a537e2c230a55b3740c5aa  readline/configure.ac
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/bpf-dis.c ./opcodes/bpf-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/bpf-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/bpf-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -553,7 +553,7 @@ print_insn_bpf (bfd_vma pc, disassemble_
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/cgen-dis.in ./opcodes/cgen-dis.in
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/cgen-dis.in	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/cgen-dis.in	2019-12-10 01:49:28.000000000 +0000
@@ -388,7 +388,7 @@ print_insn_@arch@ (bfd_vma pc, disassemb
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ChangeLog ./opcodes/ChangeLog
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ChangeLog	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/ChangeLog	2019-12-10 01:49:28.000000000 +0000
@@ -1,3 +1,37 @@
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	PR 24960
+	* disassemble.c (disassemble_free_target): New function.
+
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	* cgen-dis.in (print_insn_@arch@): Replace insn_sets with private_data.
+	* disassemble.c (disassemble_init_for_target): Likewise.
+	* bpf-dis.c: Regenerate.
+	* epiphany-dis.c: Regenerate.
+	* fr30-dis.c: Regenerate.
+	* frv-dis.c: Regenerate.
+	* ip2k-dis.c: Regenerate.
+	* iq2000-dis.c: Regenerate.
+	* lm32-dis.c: Regenerate.
+	* m32c-dis.c: Regenerate.
+	* m32r-dis.c: Regenerate.
+	* mep-dis.c: Regenerate.
+	* mt-dis.c: Regenerate.
+	* or1k-dis.c: Regenerate.
+	* xc16x-dis.c: Regenerate.
+	* xstormy16-dis.c: Regenerate.
+
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	* ppc-dis.c (private): Delete variable.
+	(get_powerpc_dialect): Don't segfault on NULL info->private_data.
+	(powerpc_init_dialect): Don't use global private.
+
+2019-12-10  Alan Modra  <amodra@gmail.com>
+
+	* s12z-opc.c: Formatting.
+
 2019-12-08  Alan Modra  <amodra@gmail.com>
 
 	* s12z-opc.c (exg_sex_discrim): Don't leak memory on invalid
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/disassemble.c ./opcodes/disassemble.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/disassemble.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/disassemble.c	2019-12-10 01:49:28.000000000 +0000
@@ -654,26 +654,26 @@ disassemble_init_for_target (struct disa
       /* This processor in fact is little endian.  The value set here
 	 reflects the way opcodes are written in the cgen description.  */
       info->endian = BFD_ENDIAN_BIG;
-      if (! info->insn_sets)
+      if (!info->private_data)
 	{
-	  info->insn_sets = cgen_bitset_create (ISA_MAX);
+	  info->private_data = cgen_bitset_create (ISA_MAX);
 	  if (info->mach == bfd_mach_m16c)
-	    cgen_bitset_set (info->insn_sets, ISA_M16C);
+	    cgen_bitset_set (info->private_data, ISA_M16C);
 	  else
-	    cgen_bitset_set (info->insn_sets, ISA_M32C);
+	    cgen_bitset_set (info->private_data, ISA_M32C);
 	}
       break;
 #endif
 #ifdef ARCH_bpf
     case bfd_arch_bpf:
-      if (!info->insn_sets)
-        {
-          info->insn_sets = cgen_bitset_create (ISA_EBPFMAX);
-          if (info->endian == BFD_ENDIAN_BIG)
-            cgen_bitset_set (info->insn_sets, ISA_EBPFBE);
-          else
-            cgen_bitset_set (info->insn_sets, ISA_EBPFLE);
-        }
+      if (!info->private_data)
+	{
+	  info->private_data = cgen_bitset_create (ISA_EBPFMAX);
+	  if (info->endian == BFD_ENDIAN_BIG)
+	    cgen_bitset_set (info->private_data, ISA_EBPFBE);
+	  else
+	    cgen_bitset_set (info->private_data, ISA_EBPFLE);
+	}
       break;
 #endif
 #ifdef ARCH_pru
@@ -716,6 +716,65 @@ disassemble_init_for_target (struct disa
     }
 }
 
+void
+disassemble_free_target (struct disassemble_info *info)
+{
+  if (info == NULL)
+    return;
+
+  switch (info->arch)
+    {
+    default:
+      return;
+
+#ifdef ARCH_bpf
+    case bfd_arch_bpf:
+#endif
+#ifdef ARCH_m32c
+    case bfd_arch_m32c:
+#endif
+#if defined ARCH_bpf || defined ARCH_m32c
+      if (info->private_data)
+	{
+	  CGEN_BITSET *mask = info->private_data;
+	  free (mask->bits);
+	}
+      break;
+#endif
+
+#ifdef ARCH_arc
+    case bfd_arch_arc:
+      break;
+#endif
+#ifdef ARCH_cris
+    case bfd_arch_cris:
+      break;
+#endif
+#ifdef ARCH_mmix
+    case bfd_arch_mmix:
+      break;
+#endif
+#ifdef ARCH_nfp
+    case bfd_arch_nfp:
+      break;
+#endif
+#ifdef ARCH_powerpc
+    case bfd_arch_powerpc:
+      break;
+#endif
+#ifdef ARCH_riscv
+    case bfd_arch_riscv:
+      break;
+#endif
+#ifdef ARCH_rs6000
+    case bfd_arch_rs6000:
+      break;
+#endif
+    }
+
+  free (info->private_data);
+}
+
 /* Remove whitespace and consecutive commas from OPTIONS.  */
 
 char *
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/epiphany-dis.c ./opcodes/epiphany-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/epiphany-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/epiphany-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -629,7 +629,7 @@ print_insn_epiphany (bfd_vma pc, disasse
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/fr30-dis.c ./opcodes/fr30-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/fr30-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/fr30-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -650,7 +650,7 @@ print_insn_fr30 (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/frv-dis.c ./opcodes/frv-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/frv-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/frv-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -747,7 +747,7 @@ print_insn_frv (bfd_vma pc, disassemble_
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ip2k-dis.c ./opcodes/ip2k-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ip2k-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/ip2k-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -639,7 +639,7 @@ print_insn_ip2k (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/iq2000-dis.c ./opcodes/iq2000-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/iq2000-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/iq2000-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -540,7 +540,7 @@ print_insn_iq2000 (bfd_vma pc, disassemb
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/lm32-dis.c ./opcodes/lm32-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/lm32-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/lm32-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -498,7 +498,7 @@ print_insn_lm32 (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/m32c-dis.c ./opcodes/m32c-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/m32c-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/m32c-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -1242,7 +1242,7 @@ print_insn_m32c (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/m32r-dis.c ./opcodes/m32r-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/m32r-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/m32r-dis.c	2019-12-10 01:49:28.000000000 +0000
@@ -630,7 +630,7 @@ print_insn_m32r (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/mep-dis.c ./opcodes/mep-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/mep-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/mep-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -1538,7 +1538,7 @@ print_insn_mep (bfd_vma pc, disassemble_
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/mt-dis.c ./opcodes/mt-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/mt-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/mt-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -641,7 +641,7 @@ print_insn_mt (bfd_vma pc, disassemble_i
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/or1k-dis.c ./opcodes/or1k-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/or1k-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/or1k-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -534,7 +534,7 @@ print_insn_or1k (bfd_vma pc, disassemble
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ppc-dis.c ./opcodes/ppc-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/ppc-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/ppc-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -40,7 +40,7 @@ struct dis_private
 {
   /* Stash the result of parsing disassembler_options here.  */
   ppc_cpu_t dialect;
-} private;
+};
 
 #define POWERPC_DIALECT(INFO) \
   (((struct dis_private *) ((INFO)->private_data))->dialect)
@@ -259,7 +259,8 @@ get_powerpc_dialect (struct disassemble_
 {
   ppc_cpu_t dialect = 0;
 
-  dialect = POWERPC_DIALECT (info);
+  if (info->private_data)
+    dialect = POWERPC_DIALECT (info);
 
   /* Disassemble according to the section headers flags for VLE-mode.  */
   if (dialect & PPC_OPCODE_VLE
@@ -308,7 +309,7 @@ powerpc_init_dialect (struct disassemble
   struct dis_private *priv = calloc (sizeof (*priv), 1);
 
   if (priv == NULL)
-    priv = &private;
+    return;
 
   switch (info->mach)
     {
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/s12z-opc.c ./opcodes/s12z-opc.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/s12z-opc.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/s12z-opc.c	2019-12-10 01:49:29.000000000 +0000
@@ -256,7 +256,8 @@ xysp_reg_from_postbyte (uint8_t postbyte
   return reg;
 }
 
-static struct operand * create_immediate_operand (int value)
+static struct operand *
+create_immediate_operand (int value)
 {
   struct immediate_operand *op = malloc (sizeof (*op));
 
@@ -267,7 +268,8 @@ static struct operand * create_immediate
   return (struct operand *) op;
 }
 
-static struct operand * create_bitfield_operand (int width, int offset)
+static struct operand *
+create_bitfield_operand (int width, int offset)
 {
   struct bitfield_operand *op = malloc (sizeof (*op));
 
@@ -297,7 +299,8 @@ create_register_operand (int reg)
   return create_register_operand_with_size (reg, -1);
 }
 
-static struct operand * create_register_all_operand (void)
+static struct operand *
+create_register_all_operand (void)
 {
   struct register_operand *op = malloc (sizeof (*op));
 
@@ -307,7 +310,8 @@ static struct operand * create_register_
   return (struct operand *) op;
 }
 
-static struct operand * create_register_all16_operand (void)
+static struct operand *
+create_register_all16_operand (void)
 {
   struct register_operand *op = malloc (sizeof (*op));
 
@@ -371,7 +375,8 @@ create_memory_auto_operand (enum op_reg_
 
 
 static void
-z_ext24_decode (struct mem_read_abstraction_base *mra, int *n_operands, struct operand **operand)
+z_ext24_decode (struct mem_read_abstraction_base *mra, int *n_operands,
+		struct operand **operand)
 {
   uint8_t buffer[3];
   int status = mra->read (mra, 0, 3, buffer);
@@ -391,7 +396,8 @@ z_ext24_decode (struct mem_read_abstract
 
 
 static uint32_t
-z_decode_signed_value (struct mem_read_abstraction_base *mra, int offset, short size)
+z_decode_signed_value (struct mem_read_abstraction_base *mra, int offset,
+		       short size)
 {
   assert (size >0);
   assert (size <= 4);
@@ -438,7 +444,7 @@ x_imm1 (struct mem_read_abstraction_base
 /* An eight bit immediate operand.  */
 static void
 imm1_decode (struct mem_read_abstraction_base *mra,
-	int *n_operands, struct operand **operand)
+	     int *n_operands, struct operand **operand)
 {
   x_imm1 (mra, 0, n_operands, operand);
 }
@@ -485,30 +491,30 @@ x_opr_decode_with_size (struct mem_read_
 	else
 	  n = x;
 
-        operand = create_immediate_operand (n);
+	operand = create_immediate_operand (n);
 	break;
       }
     case OPR_REG:
       {
 	uint8_t x = (postbyte & 0x07);
-        operand = create_register_operand (x);
+	operand = create_register_operand (x);
 	break;
       }
     case OPR_OFXYS:
       {
-        operand = create_memory_operand (false, postbyte & 0x0F, 1,
+	operand = create_memory_operand (false, postbyte & 0x0F, 1,
 					 xysp_reg_from_postbyte (postbyte), -1);
 	break;
       }
     case OPR_REG_DIRECT:
       {
-        operand = create_memory_operand (false, 0, 2, postbyte & 0x07,
+	operand = create_memory_operand (false, 0, 2, postbyte & 0x07,
 					 xysp_reg_from_postbyte (postbyte));
 	break;
       }
     case OPR_REG_INDIRECT:
       {
-        operand = create_memory_operand (true, 0, 2, postbyte & 0x07,
+	operand = create_memory_operand (true, 0, 2, postbyte & 0x07,
 					 (postbyte & 0x10) ? REG_Y : REG_X);
 	break;
       }
@@ -525,7 +531,7 @@ x_opr_decode_with_size (struct mem_read_
 	    idx -= 0x1UL << 8;
 	  }
 
-        operand = create_memory_operand (true, idx, 1,
+	operand = create_memory_operand (true, idx, 1,
 					 xysp_reg_from_postbyte (postbyte), -1);
 	break;
       }
@@ -542,7 +548,7 @@ x_opr_decode_with_size (struct mem_read_
 	    idx -= 0x1UL << 24;
 	  }
 
-        operand = create_memory_operand (false, idx, 1,
+	operand = create_memory_operand (false, idx, 1,
 					 xysp_reg_from_postbyte (postbyte), -1);
 	break;
       }
@@ -559,7 +565,7 @@ x_opr_decode_with_size (struct mem_read_
 	    idx -= 0x1UL << 24;
 	  }
 
-        operand = create_memory_operand (false, idx, 1, postbyte & 0x07, -1);
+	operand = create_memory_operand (false, idx, 1, postbyte & 0x07, -1);
 	break;
       }
 
@@ -592,7 +598,7 @@ x_opr_decode_with_size (struct mem_read_
 	    idx -= 0x1UL << 8;
 	  }
 
-        operand = create_memory_operand (false, idx, 1,
+	operand = create_memory_operand (false, idx, 1,
 					 xysp_reg_from_postbyte (postbyte), -1);
 	break;
       }
@@ -604,7 +610,7 @@ x_opr_decode_with_size (struct mem_read_
 	uint32_t idx = x[1] | x[0] << 8 ;
 	idx |= (postbyte & 0x30) << 12;
 
-        operand = create_memory_operand (false, idx, 1, postbyte & 0x07, -1);
+	operand = create_memory_operand (false, idx, 1, postbyte & 0x07, -1);
 	break;
       }
 
@@ -709,7 +715,7 @@ x_opr_decode_with_size (struct mem_read_
 	    ext24 |= buffer[i] << (8 * (size - i - 1));
 	  }
 
-        operand = create_memory_operand (true, ext24, 0, -1, -1);
+	operand = create_memory_operand (true, ext24, 0, -1, -1);
 	break;
       }
 
@@ -1003,7 +1009,9 @@ sub_d6_y_x (struct mem_read_abstraction_
   operand[(*n_operands)++] = create_register_operand (REG_X);
 }
 
-static void ld_18bit_decode (struct mem_read_abstraction_base *mra, int *n_operands, struct operand **operand);
+static void
+ld_18bit_decode (struct mem_read_abstraction_base *mra, int *n_operands,
+		 struct operand **operand);
 
 static enum optr
 mul_discrim (struct mem_read_abstraction_base *mra, enum optr hint)
@@ -2254,7 +2262,7 @@ loop_primitive_discrim (struct mem_read_
 
 static void
 loop_primitive_decode (struct mem_read_abstraction_base *mra,
-		  int *n_operands, struct operand **operands)
+		       int *n_operands, struct operand **operands)
 {
   int offs = 1;
   uint8_t lb;
@@ -2294,7 +2302,8 @@ loop_primitive_decode (struct mem_read_a
 
 
 static enum optr
-shift_discrim (struct mem_read_abstraction_base *mra,  enum optr hint ATTRIBUTE_UNUSED)
+shift_discrim (struct mem_read_abstraction_base *mra,
+	       enum optr hint ATTRIBUTE_UNUSED)
 {
   size_t i;
   uint8_t sb;
@@ -2323,7 +2332,8 @@ shift_discrim (struct mem_read_abstracti
 
 
 static void
-shift_decode (struct mem_read_abstraction_base *mra,  int *n_operands, struct operand **operands)
+shift_decode (struct mem_read_abstraction_base *mra, int *n_operands,
+	      struct operand **operands)
 {
   size_t i;
 
@@ -2415,30 +2425,30 @@ shift_decode (struct mem_read_abstractio
 
     case SB_REG_REG_N:
       {
-        uint8_t xb;
-        mra->read (mra, 1, 1, &xb);
+	uint8_t xb;
+	mra->read (mra, 1, 1, &xb);
 
-        /* This case is slightly unusual.
-           If XB matches the binary pattern 0111XXXX, then instead of
-           interpreting this as a general OPR postbyte in the IMMe4 mode,
-           the XB byte is interpreted in s special way.  */
-        if ((xb & 0xF0) == 0x70)
-          {
-            if (byte & 0x10)
-              {
-                int shift = ((sb & 0x08) >> 3) | ((xb & 0x0f) << 1);
-                operands[(*n_operands)++] = create_immediate_operand (shift);
-              }
-            else
-              {
-                /* This should not happen.  */
-                abort ();
-              }
-          }
-        else
-          {
-            operands[(*n_operands)++] = x_opr_decode (mra, 1);
-          }
+	/* This case is slightly unusual.
+	   If XB matches the binary pattern 0111XXXX, then instead of
+	   interpreting this as a general OPR postbyte in the IMMe4 mode,
+	   the XB byte is interpreted in s special way.  */
+	if ((xb & 0xF0) == 0x70)
+	  {
+	    if (byte & 0x10)
+	      {
+		int shift = ((sb & 0x08) >> 3) | ((xb & 0x0f) << 1);
+		operands[(*n_operands)++] = create_immediate_operand (shift);
+	      }
+	    else
+	      {
+		/* This should not happen.  */
+		abort ();
+	      }
+	  }
+	else
+	  {
+	    operands[(*n_operands)++] = x_opr_decode (mra, 1);
+	  }
       }
       break;
     case SB_REG_OPR_OPR:
@@ -2470,8 +2480,8 @@ shift_decode (struct mem_read_abstractio
     case SB_REG_OPR_EFF:
     case SB_OPR_N:
       {
-        int imm = (sb & 0x08) ? 2 : 1;
-        operands[(*n_operands)++] = create_immediate_operand (imm);
+	int imm = (sb & 0x08) ? 2 : 1;
+	operands[(*n_operands)++] = create_immediate_operand (imm);
       }
       break;
 
@@ -2505,9 +2515,7 @@ psh_pul_decode (struct mem_read_abstract
   if (byte & 0x40)
     {
       if ((byte & 0x3F) == 0)
-        {
-	  operand[(*n_operands)++] = create_register_all16_operand ();
-        }
+	operand[(*n_operands)++] = create_register_all16_operand ();
       else
 	for (bit = 5; bit >= 0; --bit)
 	  {
@@ -2520,9 +2528,7 @@ psh_pul_decode (struct mem_read_abstract
   else
     {
       if ((byte & 0x3F) == 0)
-        {
-	  operand[(*n_operands)++] = create_register_all_operand ();
-        }
+	operand[(*n_operands)++] = create_register_all_operand ();
       else
 	for (bit = 5; bit >= 0; --bit)
 	  {
@@ -2535,7 +2541,8 @@ psh_pul_decode (struct mem_read_abstract
 }
 
 static enum optr
-bit_field_discrim (struct mem_read_abstraction_base *mra, enum optr hint ATTRIBUTE_UNUSED)
+bit_field_discrim (struct mem_read_abstraction_base *mra,
+		   enum optr hint ATTRIBUTE_UNUSED)
 {
   int status;
   bfd_byte bb;
@@ -2569,10 +2576,10 @@ bit_field_decode (struct mem_read_abstra
     {
       bbs = bb_modes + i;
       if ((bb & bbs->mask) == bbs->value)
-        {
-          mode = bbs->mode;
-          break;
-        }
+	{
+	  mode = bbs->mode;
+	  break;
+	}
     }
   int reg1 = byte2 & 0x07;
   /* First operand */
@@ -2600,15 +2607,15 @@ bit_field_decode (struct mem_read_abstra
     case BB_REG_REG_REG:
     case BB_REG_REG_IMM:
       {
-        int reg_src = (bb >> 2) & 0x07;
-        operands[(*n_operands)++] = create_register_operand (reg_src);
+	int reg_src = (bb >> 2) & 0x07;
+	operands[(*n_operands)++] = create_register_operand (reg_src);
       }
       break;
     case BB_OPR_REG_REG:
     case BB_OPR_REG_IMM:
       {
-        int reg_src = (byte2 & 0x07);
-        operands[(*n_operands)++] = create_register_operand (reg_src);
+	int reg_src = (byte2 & 0x07);
+	operands[(*n_operands)++] = create_register_operand (reg_src);
       }
       break;
     case BB_REG_OPR_REG:
@@ -2628,7 +2635,7 @@ bit_field_decode (struct mem_read_abstra
     case BB_OPR_REG_REG:
     case BB_REG_OPR_REG:
       {
-        int reg_parm = bb & 0x03;
+	int reg_parm = bb & 0x03;
 	operands[(*n_operands)++] = create_register_operand (reg_parm);
       }
       break;
@@ -2636,13 +2643,13 @@ bit_field_decode (struct mem_read_abstra
     case BB_OPR_REG_IMM:
     case BB_REG_OPR_IMM:
       {
-        bfd_byte i1;
-        mra->read (mra, 1, 1, &i1);
-        int offset = i1 & 0x1f;
-        int width = bb & 0x03;
-        width <<= 3;
-        width |= i1 >> 5;
-        operands[(*n_operands)++] = create_bitfield_operand (width, offset);
+	bfd_byte i1;
+	mra->read (mra, 1, 1, &i1);
+	int offset = i1 & 0x1f;
+	int width = bb & 0x03;
+	width <<= 3;
+	width |= i1 >> 5;
+	operands[(*n_operands)++] = create_bitfield_operand (width, offset);
       }
       break;
     }
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/xc16x-dis.c ./opcodes/xc16x-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/xc16x-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/xc16x-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -771,7 +771,7 @@ print_insn_xc16x (bfd_vma pc, disassembl
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
diff -a -u -r --new-file --show-function-line='^[A-Za-z_]' /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/xstormy16-dis.c ./opcodes/xstormy16-dis.c
--- /sourceware/snapshot-tmp/gdb/snapshot/current-gdb/update-snapshot/old/gdb-9.0.50.20191209/opcodes/xstormy16-dis.c	2019-12-09 01:49:32.000000000 +0000
+++ ./opcodes/xstormy16-dis.c	2019-12-10 01:49:29.000000000 +0000
@@ -519,7 +519,7 @@ print_insn_xstormy16 (bfd_vma pc, disass
     cgen_bitset_add (isa, CGEN_COMPUTE_ISA (info));
   }
 #else
-  isa = info->insn_sets;
+  isa = info->private_data;
 #endif
 
   /* If we've switched cpu's, try to find a handle we've used before */
