aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Breazeal <donb@codesourcery.com>2015-05-14 13:11:41 -0700
committerDon Breazeal <donb@codesourcery.com>2015-05-14 13:11:41 -0700
commit61a7418ccb7c2de12d4c4df79e193f32db938a11 (patch)
tree56baf119ff902737d12ca79df63ddebebd1404ca
parent1041a03c1b4d03c39033c8bb942148dc3e4b4acc (diff)
downloadgdb-61a7418ccb7c2de12d4c4df79e193f32db938a11.zip
gdb-61a7418ccb7c2de12d4c4df79e193f32db938a11.tar.gz
gdb-61a7418ccb7c2de12d4c4df79e193f32db938a11.tar.bz2
Fix build gdbserver build errors on arm, mips, aarch64.
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: * 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.
-rw-r--r--gdb/gdbserver/linux-aarch64-low.c10
-rw-r--r--gdb/gdbserver/linux-arm-low.c12
-rw-r--r--gdb/gdbserver/linux-mips-low.c12
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;