From patchwork Thu May 14 20:25:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Breazeal X-Patchwork-Id: 6727 Received: (qmail 107125 invoked by alias); 14 May 2015 20:25:21 -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 107109 invoked by uid 89); 14 May 2015 20:25:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 14 May 2015 20:25:18 +0000 Received: from svr-orw-fem-04.mgc.mentorg.com ([147.34.97.41]) by relay1.mentorg.com with esmtp id 1Yszgw-0007jj-It from Don_Breazeal@mentor.com ; Thu, 14 May 2015 13:25:14 -0700 Received: from build4-lucid-cs (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.3.224.2; Thu, 14 May 2015 13:25:14 -0700 Received: by build4-lucid-cs (Postfix, from userid 1905) id EB18540E8F; Thu, 14 May 2015 13:25:13 -0700 (PDT) From: Don Breazeal To: , Subject: [commit/obv][PATCH] Fix build errors on arm, aarch64, and mips. Date: Thu, 14 May 2015 13:25:13 -0700 Message-ID: <1431635113-30805-1-git-send-email-donb@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes Committed as obvious: Fix build errors introduced by https://sourceware.org/ml/gdb-patches/2015-05/msg00281.html, which didn't account for the change of the name of the struct process_info field 'private' to 'priv' made in https://sourceware.org/ml/gdb-patches/2015-02/msg00829.html. gdb/gdbserver/ChangeLog: 2015-05-14 Don Breazeal * linux-aarch64-low.c (aarch64_linux_new_fork): Change reference to process_info.private to process_info.priv. * linux-arm-low.c (arm_new_fork): Likewise. * linux-mips-low.c (mips_linux_new_fork): Likewise. --- gdb/gdbserver/linux-aarch64-low.c | 10 +++++----- gdb/gdbserver/linux-arm-low.c | 12 ++++++------ gdb/gdbserver/linux-mips-low.c | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gdb/gdbserver/linux-aarch64-low.c b/gdb/gdbserver/linux-aarch64-low.c index 7e6e9ac..043458d 100644 --- a/gdb/gdbserver/linux-aarch64-low.c +++ b/gdb/gdbserver/linux-aarch64-low.c @@ -1140,10 +1140,10 @@ aarch64_linux_new_fork (struct process_info *parent, struct process_info *child) { /* These are allocated by linux_add_process. */ - gdb_assert (parent->private != NULL - && parent->private->arch_private != NULL); - gdb_assert (child->private != NULL - && child->private->arch_private != NULL); + gdb_assert (parent->priv != NULL + && parent->priv->arch_private != NULL); + gdb_assert (child->priv != NULL + && child->priv->arch_private != NULL); /* Linux kernel before 2.6.33 commit 72f674d203cd230426437cdcf7dd6f681dad8b0d @@ -1159,7 +1159,7 @@ aarch64_linux_new_fork (struct process_info *parent, in the end before detaching the forked off process, thus making this compatible with older Linux kernels too. */ - *child->private->arch_private = *parent->private->arch_private; + *child->priv->arch_private = *parent->priv->arch_private; } /* Called when resuming a thread. diff --git a/gdb/gdbserver/linux-arm-low.c b/gdb/gdbserver/linux-arm-low.c index 3420dea..dd77b48 100644 --- a/gdb/gdbserver/linux-arm-low.c +++ b/gdb/gdbserver/linux-arm-low.c @@ -720,17 +720,17 @@ arm_new_thread (struct lwp_info *lwp) static void arm_new_fork (struct process_info *parent, struct process_info *child) { - struct arch_process_info *parent_proc_info = parent->private->arch_private; - struct arch_process_info *child_proc_info = child->private->arch_private; + struct arch_process_info *parent_proc_info = parent->priv->arch_private; + struct arch_process_info *child_proc_info = child->priv->arch_private; struct lwp_info *child_lwp; struct arch_lwp_info *child_lwp_info; int i; /* These are allocated by linux_add_process. */ - gdb_assert (parent->private != NULL - && parent->private->arch_private != NULL); - gdb_assert (child->private != NULL - && child->private->arch_private != NULL); + gdb_assert (parent->priv != NULL + && parent->priv->arch_private != NULL); + gdb_assert (child->priv != NULL + && child->priv->arch_private != NULL); /* Linux kernel before 2.6.33 commit 72f674d203cd230426437cdcf7dd6f681dad8b0d diff --git a/gdb/gdbserver/linux-mips-low.c b/gdb/gdbserver/linux-mips-low.c index 4601ad0..1695c4c 100644 --- a/gdb/gdbserver/linux-mips-low.c +++ b/gdb/gdbserver/linux-mips-low.c @@ -376,10 +376,10 @@ mips_linux_new_fork (struct process_info *parent, struct mips_watchpoint *wp; /* These are allocated by linux_add_process. */ - gdb_assert (parent->private != NULL - && parent->private->arch_private != NULL); - gdb_assert (child->private != NULL - && child->private->arch_private != NULL); + gdb_assert (parent->priv != NULL + && parent->priv->arch_private != NULL); + gdb_assert (child->priv != NULL + && child->priv->arch_private != NULL); /* Linux kernel before 2.6.33 commit 72f674d203cd230426437cdcf7dd6f681dad8b0d @@ -395,8 +395,8 @@ mips_linux_new_fork (struct process_info *parent, in the end before detaching the forked off process, thus making this compatible with older Linux kernels too. */ - parent_private = parent->private->arch_private; - child_private = child->private->arch_private; + parent_private = parent->priv->arch_private; + child_private = child->priv->arch_private; child_private->watch_readback_valid = parent_private->watch_readback_valid; child_private->watch_readback = parent_private->watch_readback;