[binutils-gdb] Apply "Convert observers to C++" edit to gdbarch.sh

[Pedro Alves <palves at sourceware dot org>]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=0bee6dd4aa42b928c2a7a496596490b694e5722b

commit 0bee6dd4aa42b928c2a7a496596490b694e5722b
Author: Pedro Alves <palves@redhat.com>
Date:   Mon Apr 9 15:34:48 2018 +0100

    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  <palves@redhat.com>
    
    	* gdbarch.sh: Include "observable.h" instead of "observer.h".
    	(set_target_gdbarch): Call
    	gdb::observers::architecture_changed.notify instead of
    	observer_notify_architecture_changed.

Diff:
---
 gdb/ChangeLog  | 7 +++++++
 gdb/gdbarch.sh | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fc95d76..71e175f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-09  Pedro Alves  <palves@redhat.com>
+
+	* 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  <simon.marchi@polymtl.ca>
 
 	* tracepoint.c (struct current_traceframe_cleanup): Remove.
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 33dfa6b..0923029 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -1644,7 +1644,7 @@ cat <<EOF
 #include "reggroups.h"
 #include "osabi.h"
 #include "gdb_obstack.h"
-#include "observer.h"
+#include "observable.h"
 #include "regcache.h"
 #include "objfiles.h"
 #include "auxv.h"
@@ -2506,7 +2506,7 @@ set_target_gdbarch (struct gdbarch *new_gdbarch)
   gdb_assert (new_gdbarch != NULL);
   gdb_assert (new_gdbarch->initialized_p);
   current_inferior ()->gdbarch = new_gdbarch;
-  observer_notify_architecture_changed (new_gdbarch);
+  gdb::observers::architecture_changed.notify (new_gdbarch);
   registers_changed ();
 }