From patchwork Mon Apr 9 14:42:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 26655 Received: (qmail 80236 invoked by alias); 9 Apr 2018 14:42:56 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 80226 invoked by uid 89); 9 Apr 2018 14:42:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3 autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 09 Apr 2018 14:42:54 +0000 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AAAE8182D11; Mon, 9 Apr 2018 14:42:53 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82C607C2F; Mon, 9 Apr 2018 14:42:52 +0000 (UTC) Subject: [pushed/ob] Apply "Convert observers to C++" edit to gdbarch.sh (Re: [PATCH] infrun: step through indirect branch thunks) To: "Metzger, Markus T" , "gdb-patches@sourceware.org" References: <1519017382-24335-1-git-send-email-markus.t.metzger@intel.com> <4dfab882-016f-01b5-bb28-67cd6637acea@redhat.com> From: Pedro Alves Message-ID: <944991b6-f949-4c3f-22d3-dffb2dd84e67@redhat.com> Date: Mon, 9 Apr 2018 15:42:51 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: On 04/09/2018 03:19 PM, Metzger, Markus T wrote: > While regenerating gdbarch, I noticed that it generated the following > unrelated changes: > > --- gdbarch.c 2018-04-09 14:56:08.976814000 +0200 > +++ new-gdbarch.c 2018-04-09 14:57:33.914668000 +0200 > @@ -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" > @@ -5480,7 +5480,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 (); > } > > , which result in a build error: > > .../gdb/gdbarch.c:47:10: fatal error: observer.h: No such file or directory > #include "observer.h" > ^~~~~~~~~~~~ > compilation terminated. > > I excluded those from my patch. We should just fix that first. Done now. 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 fc95d7632fd..71e175fe993 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 33dfa6b349d..092302993a7 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 (); }