[commit] fix build failure in aix-thread.c:aix_thread_wait

[commit] fix build failure in aix-thread.c:aix_thread_wait

[Joel Brobecker]

[-- Attachment #1: Type: text/plain, Size: 329 bytes --]

Just an oversight from a patch that added an extra "options" parameter
for the "to_wait" target_ops method. Fixed thusly.

2009-05-21  Joel Brobecker  <brobecker@adacore.com>

        * aix-thread.c (aix_thread_wait): Add options parameter.  Use it
        to call the to_wait method in the target_beneath.

Checked in.
-- 
Joel

[-- Attachment #2: aix-thread.diff --]
[-- Type: text/x-diff, Size: 792 bytes --]

diff --git a/gdb/aix-thread.c b/gdb/aix-thread.c
index 35103f5..8af0571 100644
--- a/gdb/aix-thread.c
+++ b/gdb/aix-thread.c
@@ -1012,7 +1012,7 @@ aix_thread_resume (struct target_ops *ops,
 
 static ptid_t
 aix_thread_wait (struct target_ops *ops,
-		 ptid_t ptid, struct target_waitstatus *status)
+		 ptid_t ptid, struct target_waitstatus *status, int options)
 {
   struct cleanup *cleanup = save_inferior_ptid ();
   struct target_ops *beneath = find_target_beneath (ops);
@@ -1020,7 +1020,7 @@ aix_thread_wait (struct target_ops *ops,
   pid_to_prc (&ptid);
 
   inferior_ptid = pid_to_ptid (PIDGET (inferior_ptid));
-  ptid = beneath->to_wait (beneath, ptid, status);
+  ptid = beneath->to_wait (beneath, ptid, status, options);
   do_cleanups (cleanup);
 
   if (PIDGET (ptid) == -1)

Re: [commit] fix build failure in aix-thread.c:aix_thread_wait

[Pedro Alves]

On Thursday 21 May 2009 23:35:32, Joel Brobecker wrote:
> Just an oversight from a patch that added an extra "options" parameter
> for the "to_wait" target_ops method. Fixed thusly.

Thanks Joel.  I naively grep'ed for "to_wait = ", and missed that one.

Would you mind if I applied this?

-- 
Pedro Alves

2009-05-21  Pedro Alves  <pedro@codesourcery.com>

	* aix-thread.c (init_aix_thread_ops): Whitespace.

---
 gdb/aix-thread.c |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

Index: src/gdb/aix-thread.c
===================================================================
--- src.orig/gdb/aix-thread.c	2009-05-21 23:57:13.000000000 +0100
+++ src/gdb/aix-thread.c	2009-05-21 23:58:13.000000000 +0100
@@ -1792,26 +1792,26 @@ aix_thread_get_ada_task_ptid (long lwp, 
 static void
 init_aix_thread_ops (void)
 {
-  aix_thread_ops.to_shortname          = "aix-threads";
-  aix_thread_ops.to_longname           = _("AIX pthread support");
-  aix_thread_ops.to_doc                = _("AIX pthread support");
+  aix_thread_ops.to_shortname = "aix-threads";
+  aix_thread_ops.to_longname = _("AIX pthread support");
+  aix_thread_ops.to_doc = _("AIX pthread support");
 
-  aix_thread_ops.to_attach             = aix_thread_attach;
-  aix_thread_ops.to_detach             = aix_thread_detach;
-  aix_thread_ops.to_resume             = aix_thread_resume;
-  aix_thread_ops.to_wait               = aix_thread_wait;
-  aix_thread_ops.to_fetch_registers    = aix_thread_fetch_registers;
-  aix_thread_ops.to_store_registers    = aix_thread_store_registers;
-  aix_thread_ops.to_xfer_partial       = aix_thread_xfer_partial;
+  aix_thread_ops.to_attach = aix_thread_attach;
+  aix_thread_ops.to_detach = aix_thread_detach;
+  aix_thread_ops.to_resume = aix_thread_resume;
+  aix_thread_ops.to_wait = aix_thread_wait;
+  aix_thread_ops.to_fetch_registers = aix_thread_fetch_registers;
+  aix_thread_ops.to_store_registers = aix_thread_store_registers;
+  aix_thread_ops.to_xfer_partial = aix_thread_xfer_partial;
   /* No need for aix_thread_ops.to_create_inferior, because we activate thread
      debugging when the inferior reaches pd_brk_addr.  */
-  aix_thread_ops.to_mourn_inferior     = aix_thread_mourn_inferior;
-  aix_thread_ops.to_thread_alive       = aix_thread_thread_alive;
-  aix_thread_ops.to_pid_to_str         = aix_thread_pid_to_str;
-  aix_thread_ops.to_extra_thread_info  = aix_thread_extra_thread_info;
-  aix_thread_ops.to_get_ada_task_ptid  = aix_thread_get_ada_task_ptid;
-  aix_thread_ops.to_stratum            = thread_stratum;
-  aix_thread_ops.to_magic              = OPS_MAGIC;
+  aix_thread_ops.to_mourn_inferior = aix_thread_mourn_inferior;
+  aix_thread_ops.to_thread_alive = aix_thread_thread_alive;
+  aix_thread_ops.to_pid_to_str = aix_thread_pid_to_str;
+  aix_thread_ops.to_extra_thread_info = aix_thread_extra_thread_info;
+  aix_thread_ops.to_get_ada_task_ptid = aix_thread_get_ada_task_ptid;
+  aix_thread_ops.to_stratum = thread_stratum;
+  aix_thread_ops.to_magic = OPS_MAGIC;
 }
 
 /* Module startup initialization function, automagically called by

Re: [commit] fix build failure in aix-thread.c:aix_thread_wait

[Joel Brobecker]

> Would you mind if I applied this?

Not at all! Anything that makes your job easier...

-- 
Joel

Re: [commit] fix build failure in aix-thread.c:aix_thread_wait

[Pedro Alves]

On Friday 22 May 2009 00:08:59, Joel Brobecker wrote:
> > Would you mind if I applied this?
> 
> Not at all! Anything that makes your job easier...

Thanks, applied.

-- 
Pedro Alves