[Qemu-devel] [PATCH] Include futex.h properly.

[Qemu-devel] [PATCH] Include futex.h properly.

[Felipe Contreras]

This wasn't building properly on my system.
---
 configure            |    2 +-
 linux-user/syscall.c |    7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/configure b/configure
index 4a4ba36..f204d04 100755
--- a/configure
+++ b/configure
@@ -648,7 +648,7 @@ EOF
 # Check host NPTL support
 cat > $TMPC <<EOF
 #include <sched.h>
-#include <sys/futex.h>
+#include <linux/futex.h>
 void foo()
 {
 #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 5f2b48a..25b9e5a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -52,9 +52,6 @@
 //#include <sys/user.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
-#if defined(USE_NPTL)
-#include <sys/futex.h>
-#endif
 
 #define termios host_termios
 #define winsize host_winsize
@@ -75,6 +72,10 @@
 
 #include "qemu.h"
 
+#if defined(USE_NPTL)
+#include <linux/futex.h>
+#endif
+
 //#define DEBUG
 
 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \
-- 
1.5.6.rc0.29.g3beb5

Re: [Qemu-devel] [PATCH] Include futex.h properly.

[Anthony Liguori]

Felipe Contreras wrote:
> This wasn't building properly on my system.
> ---
>  configure            |    2 +-
>  linux-user/syscall.c |    7 ++++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index 4a4ba36..f204d04 100755
> --- a/configure
> +++ b/configure
> @@ -648,7 +648,7 @@ EOF
>  # Check host NPTL support
>  cat > $TMPC <<EOF
>  #include <sched.h>
> -#include <sys/futex.h>
> +#include <linux/futex.h>
>   

I don't have a sys/futex.h on my system either.  The futex man page 
claims that linux/futex.h should be what's included.  What system is 
sys/futex.h valid on and does that system break with linux/futex.h?

Regards,

Anthony Liguori

>  void foo()
>  {
>  #if !defined(CLONE_SETTLS) || !defined(FUTEX_WAIT)
> diff --git a/linux-user/syscall.c b/linux-user/syscall.c
> index 5f2b48a..25b9e5a 100644
> --- a/linux-user/syscall.c
> +++ b/linux-user/syscall.c
> @@ -52,9 +52,6 @@
>  //#include <sys/user.h>
>  #include <netinet/ip.h>
>  #include <netinet/tcp.h>
> -#if defined(USE_NPTL)
> -#include <sys/futex.h>
> -#endif
>  
>  #define termios host_termios
>  #define winsize host_winsize
> @@ -75,6 +72,10 @@
>  
>  #include "qemu.h"
>  
> +#if defined(USE_NPTL)
> +#include <linux/futex.h>
> +#endif
> +
>  //#define DEBUG
>  
>  #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \
>   

Re: [Qemu-devel] [PATCH] Include futex.h properly.

[Paul Brook]

> > -#include <sys/futex.h>
> > +#include <linux/futex.h>
>
> I don't have a sys/futex.h on my system either.  The futex man page
> claims that linux/futex.h should be what's included.  What system is
> sys/futex.h valid on and does that system break with linux/futex.h?

sys/futex.h was a typo made when pulling this change out of a larger patch. I 
built it to check that it "worked", but didn't check that the configure check 
actually passed.

Paul

Re: [Qemu-devel] [PATCH] Include futex.h properly.

[Felipe Contreras]

On Tue, Jun 3, 2008 at 9:48 PM, Anthony Liguori <anthony@codemonkey.ws> wrote:
> Felipe Contreras wrote:
>>
>> This wasn't building properly on my system.
>> ---
>>  configure            |    2 +-
>>  linux-user/syscall.c |    7 ++++---
>>  2 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/configure b/configure
>> index 4a4ba36..f204d04 100755
>> --- a/configure
>> +++ b/configure
>> @@ -648,7 +648,7 @@ EOF
>>  # Check host NPTL support
>>  cat > $TMPC <<EOF
>>  #include <sched.h>
>> -#include <sys/futex.h>
>> +#include <linux/futex.h>
>>
>
> I don't have a sys/futex.h on my system either.  The futex man page claims
> that linux/futex.h should be what's included.  What system is sys/futex.h
> valid on and does that system break with linux/futex.h?

According to Google it's from dietlibc.

-- 
Felipe Contreras