Upgate submodule, sync patch and code accordingly.

Gdb replaced the C observers by C++ objects. Adapt insight code to these.

* gdbtk/generic/gdbtk-bp.c: observer.h not used. Remove inclusion.
* gdbtk/generic/gdbtk-hooks.c: include observable.h.
  (gdbtk_add_hooks): use C++ observers.

diff --git a/binutils-gdb b/binutils-gdb
index 03afa6ef8ac9e5acfa68b1005aec6756eaa1d093..8ff5bf3db34b0a8a3a9fe5a03f8cb95ce2a3d038 160000 (submodule)
--- a/binutils-gdb
+++ b/binutils-gdb
@@ -1 +1 @@
-Subproject commit 03afa6ef8ac9e5acfa68b1005aec6756eaa1d093
+Subproject commit 8ff5bf3db34b0a8a3a9fe5a03f8cb95ce2a3d038

diff --git a/gdbtk/generic/gdbtk-bp.c b/gdbtk/generic/gdbtk-bp.c
index 56b9b76d248f661b3678b087806cdb090bd94fce..f3eaaad332a05944b1c2e653393f7b425e70fb12 100644 (file)
--- a/gdbtk/generic/gdbtk-bp.c
+++ b/gdbtk/generic/gdbtk-bp.c
@@ -1,5 +1,5 @@
 /* Tcl/Tk command definitions for Insight - Breakpoints.
-   Copyright (C) 2001-2017 Free Software Foundation, Inc.
+   Copyright (C) 2001-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -30,7 +30,6 @@
 #include <tcl.h>
 #include "gdbtk.h"
 #include "gdbtk-cmds.h"
-#include "observer.h"
 #include "arch-utils.h"
 #include "exceptions.h"
 

diff --git a/gdbtk/generic/gdbtk-hooks.c b/gdbtk/generic/gdbtk-hooks.c
index e32219341cf1e9e11edde52cf66ccd75a5eccd1a..2a1d5dff116cd13c6053255fd22701eb70369df8 100644 (file)
--- a/gdbtk/generic/gdbtk-hooks.c
+++ b/gdbtk/generic/gdbtk-hooks.c
@@ -31,7 +31,7 @@
 #include "top.h"
 #include "annotate.h"
 #include "cli/cli-decode.h"
-#include "observer.h"
+#include "observable.h"
 #include "gdbthread.h"
 #include "event-loop.h"
 
@@ -121,14 +121,14 @@ void
 gdbtk_add_hooks (void)
 {
   /* Gdb observers */
-  observer_attach_breakpoint_created (gdbtk_create_breakpoint);
-  observer_attach_breakpoint_modified (gdbtk_modify_breakpoint);
-  observer_attach_breakpoint_deleted (gdbtk_delete_breakpoint);
-  observer_attach_architecture_changed (gdbtk_architecture_changed);
-  observer_attach_memory_changed (gdbtk_memory_changed);
-  observer_attach_command_param_changed (gdbtk_param_changed);
-  observer_attach_register_changed (gdbtk_register_changed);
-  observer_attach_traceframe_changed (gdbtk_trace_find);
+  gdb::observers::breakpoint_created.attach (gdbtk_create_breakpoint);
+  gdb::observers::breakpoint_modified.attach (gdbtk_modify_breakpoint);
+  gdb::observers::breakpoint_deleted.attach (gdbtk_delete_breakpoint);
+  gdb::observers::architecture_changed.attach (gdbtk_architecture_changed);
+  gdb::observers::memory_changed.attach (gdbtk_memory_changed);
+  gdb::observers::command_param_changed.attach (gdbtk_param_changed);
+  gdb::observers::register_changed.attach (gdbtk_register_changed);
+  gdb::observers::traceframe_changed.attach (gdbtk_trace_find);
 
   /* Hooks */
   deprecated_call_command_hook = gdbtk_call_command;

diff --git a/patches/binutils-gdb/004-tcltkplatform.patch b/patches/binutils-gdb/004-tcltkplatform.patch
index 5a801a2224aa4c27c4c2a4b18ad2877d82422517..c7ed87e010962d3810f3034ae90e0cde27cba1cb 100644 (file)
--- a/patches/binutils-gdb/004-tcltkplatform.patch
+++ b/patches/binutils-gdb/004-tcltkplatform.patch
@@ -178,7 +178,7 @@ diff -Naurp a/gdb/configure.ac b/gdb/configure.ac
 diff -Naurp a/gdb/Makefile.in b/gdb/Makefile.in
 --- a/gdb/Makefile.in  2016-11-25 14:24:44.190083746 +0100
 +++ b/gdb/Makefile.in  2016-11-25 14:36:23.590282737 +0100
-@@ -513,7 +513,7 @@ SUBDIR_GDBTK_SRCS = \
+@@ -517,7 +517,7 @@ SUBDIR_GDBTK_SRCS = \
  
  SUBDIR_GDBTK_DEPS = $(LIBGUI) $(TCL_DEPS) $(TK_DEPS)
  SUBDIR_GDBTK_LDFLAGS =

diff --git a/patches/binutils-gdb/006-add_file_handler_with_mode.patch b/patches/binutils-gdb/006-add_file_handler_with_mode.patch
index 88c1c0f099cdc2008bf6aa5d19812e29d523f65e..013b629a77d543b24a8a8e8368d877248801d2aa 100644 (file)
--- a/patches/binutils-gdb/006-add_file_handler_with_mode.patch
+++ b/patches/binutils-gdb/006-add_file_handler_with_mode.patch
@@ -2,7 +2,7 @@ diff -Naurp binutils-gdb.orig/gdb/event-loop.c binutils-gdb.new/gdb/event-loop.c
 --- binutils-gdb.orig/gdb/event-loop.c 2018-03-04 02:53:18.489945815 +0100
 +++ binutils-gdb.new/gdb/event-loop.c  2018-03-04 02:55:37.714311378 +0100
 @@ -37,13 +37,6 @@
- #include "observer.h"
+ #include "observable.h"
  #include "top.h"
  
 -/* Tell create_file_handler what events we are interested in.