[patch] Fix Darwin/x86 compilation

[patch] Fix Darwin/x86 compilation

[Jonas Maebe]

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

Hello,

Current gdb head does not compile for Darwin due to the changes in  
this commit:

commit 60d99cc097f1fb9932bb8f52c24e4efc00a6b742
Author: Pedro Alves <pedro@codesourcery.com>
Date:   Thu May 21 15:48:41 2009 +0000

The attached patch fixes compilation for Darwin.


Jonas

2009-06-10  Jonas Maebe  <jonas.maebe@elis.ugent.be>

	Fix Darwin compilation error caused by signature change of darwin_wait.

	* darwin-nat.c (darwin_stop_inferior): Pass 0 as options to
	darwin_wait (blocking wait).
	(darwin_kill_inferior): Likewise


[-- Attachment #2: fix-darwin_wait-compilation.patch --]
[-- Type: application/octet-stream, Size: 810 bytes --]

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 8c20bd9..3246881 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -688,7 +688,7 @@ darwin_stop_inferior (struct target_ops *ops, darwin_inferior *inf)
   if (res != 0)
     warning (_("cannot kill: %s\n"), safe_strerror (errno));
 
-  ptid = darwin_wait (ops, inferior_ptid, &wstatus);
+  ptid = darwin_wait (ops, inferior_ptid, &wstatus, 0);
   gdb_assert (wstatus.kind = TARGET_WAITKIND_STOPPED);
 }
 
@@ -720,7 +720,7 @@ darwin_kill_inferior (struct target_ops *ops)
   kret = task_resume (darwin_inf->task);
   MACH_CHECK_ERROR (kret);
 
-  ptid = darwin_wait (ops, inferior_ptid, &wstatus);
+  ptid = darwin_wait (ops, inferior_ptid, &wstatus, 0);
 
   /* This double wait seems required...  */
   res = waitpid (darwin_inf->pid, &status, 0);

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

Re: [patch] Fix Darwin/x86 compilation

[Pedro Alves]

On Wednesday 10 June 2009 21:53:37, Jonas Maebe wrote:

> The attached patch fixes compilation for Darwin.

> 2009-06-10  Jonas Maebe  <jonas.maebe@elis.ugent.be>
> 
> 	Fix Darwin compilation error caused by signature change of darwin_wait.
> 
> 	* darwin-nat.c (darwin_stop_inferior): Pass 0 as options to
> 	darwin_wait (blocking wait).
> 	(darwin_kill_inferior): Likewise


Thanks, applied.

-- 
Pedro Alves