From 0bee6dd4aa42b928c2a7a496596490b694e5722b Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 9 Apr 2018 15:34:48 +0100 Subject: [PATCH] Apply "Convert observers to C++" edit to gdbarch.sh Regenerating gdbarch.c results in: --- gdbarch.c 2018-03-26 23:18:52.905548891 +0100 +++ new-gdbarch.c 2018-04-09 15:32:30.006712207 +0100 @@ -44,7 +44,7 @@ #include "reggroups.h" #include "osabi.h" #include "gdb_obstack.h" -#include "observable.h" +#include "observer.h" #include "regcache.h" #include "objfiles.h" #include "auxv.h" @@ -5457,7 +5457,7 @@ gdb_assert (new_gdbarch != NULL); gdb_assert (new_gdbarch->initialized_p); current_inferior ()->gdbarch = new_gdbarch; - gdb::observers::architecture_changed.notify (new_gdbarch); + observer_notify_architecture_changed (new_gdbarch); registers_changed (); } Clearly commit 76727919ceb5 ("Convert observers to C++") edited gdbarch.c directly instead of gdbarch.sh. This fixes it. gdb/ChangeLog: 2018-04-09 Pedro Alves * gdbarch.sh: Include "observable.h" instead of "observer.h". (set_target_gdbarch): Call gdb::observers::architecture_changed.notify instead of observer_notify_architecture_changed. --- gdb/ChangeLog | 7 +++++++ gdb/gdbarch.sh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index fc95d7632f..71e175fe99 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-04-09 Pedro Alves + + * gdbarch.sh: Include "observable.h" instead of "observer.h". + (set_target_gdbarch): Call + gdb::observers::architecture_changed.notify instead of + observer_notify_architecture_changed. + 2018-04-07 Simon Marchi * tracepoint.c (struct current_traceframe_cleanup): Remove. diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 33dfa6b349..092302993a 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -1644,7 +1644,7 @@ cat <initialized_p); current_inferior ()->gdbarch = new_gdbarch; - observer_notify_architecture_changed (new_gdbarch); + gdb::observers::architecture_changed.notify (new_gdbarch); registers_changed (); } -- 2.34.1