Merge branch 'master' into merge-job

diff --git a/bfd/version.h b/bfd/version.h
index 7961e2f9d9e2137e29e71d1ee909678bdad00785..909f006072c49e73a965cc20979b2842c7d1ff2c 100644 (file)
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -16,7 +16,7 @@
 
    In releases, the date is not included in either version strings or
    sonames.  */
-#define BFD_VERSION_DATE 20200107
+#define BFD_VERSION_DATE 20200108
 #define BFD_VERSION @bfd_version@
 #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
 #define REPORT_BUGS_TO @report_bugs_to@

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index b82ef3d09d72a2c4568de15dc00e23a0ddf57a18..13099276a4b9702b8ffe9e6cecaae0a4877ad538 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-07  Tom Tromey  <tromey@adacore.com>
+
+       PR build/24937:
+       * stap-probe.c (class stap_static_probe_ops): Add constructor.
+
 2020-01-02  Jon Turney  <jon.turney@dronecode.org.uk>
 
        * cli/cli-style.c: Set cli_styling to 'true' in the Cygwin build.

diff --git a/gdb/stap-probe.c b/gdb/stap-probe.c
index 806725c75e68383e731c2abf87f0c7ef747ca83e..39da2900e7af30d0c24702019c8b835038b0b646 100644 (file)
--- a/gdb/stap-probe.c
+++ b/gdb/stap-probe.c
@@ -101,6 +101,12 @@ struct stap_probe_arg
 class stap_static_probe_ops : public static_probe_ops
 {
 public:
+  /* We need a user-provided constructor to placate some compilers.
+     See PR build/24937.  */
+  stap_static_probe_ops ()
+  {
+  }
+
   /* See probe.h.  */
   bool is_linespec (const char **linespecp) const override;