[Qemu-devel] [PATCH] qemu-barrier: Fix build failure on PowerPC Mac OS X

[Qemu-devel] [PATCH] qemu-barrier: Fix build failure on PowerPC Mac OS X

[Eric Sunshine]

qemu-barrier.h tests if macro __powerpc__ is defined, however, the
preprocessor on PowerPC Mac OS X defines only __POWERPC__, not
__powerpc__.  Resolve by testing instead for qemu-provided _ARCH_PPC.

Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
---

The anomalous __powerpc__ test appears only in qemu-barrier.h.
No other source files reference this name.

Cc: David Gibson <david@gibson.dropbear.id.au>

 qemu-barrier.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/qemu-barrier.h b/qemu-barrier.h
index 735eea6..c11bb2b 100644
--- a/qemu-barrier.h
+++ b/qemu-barrier.h
@@ -14,7 +14,7 @@
  */
 #define smp_wmb()   barrier()
 
-#elif defined(__powerpc__)
+#elif defined(_ARCH_PPC)
 
 /*
  * We use an eieio() for a wmb() on powerpc.  This assumes we don't
-- 
1.7.7.1

Re: [Qemu-devel] [PATCH] qemu-barrier: Fix build failure on PowerPC Mac OS X

[Anthony Liguori]

On 11/01/2011 04:39 AM, Eric Sunshine wrote:
> qemu-barrier.h tests if macro __powerpc__ is defined, however, the
> preprocessor on PowerPC Mac OS X defines only __POWERPC__, not
> __powerpc__.  Resolve by testing instead for qemu-provided _ARCH_PPC.
>
> Signed-off-by: Eric Sunshine<sunshine@sunshineco.com>

Applied.  Thanks.

Regards,

Anthony Liguori

> ---
>
> The anomalous __powerpc__ test appears only in qemu-barrier.h.
> No other source files reference this name.
>
> Cc: David Gibson<david@gibson.dropbear.id.au>

>
>   qemu-barrier.h |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-barrier.h b/qemu-barrier.h
> index 735eea6..c11bb2b 100644
> --- a/qemu-barrier.h
> +++ b/qemu-barrier.h
> @@ -14,7 +14,7 @@
>    */
>   #define smp_wmb()   barrier()
>
> -#elif defined(__powerpc__)
> +#elif defined(_ARCH_PPC)
>
>   /*
>    * We use an eieio() for a wmb() on powerpc.  This assumes we don't

Re: [Qemu-devel] [PATCH] qemu-barrier: Fix build failure on PowerPC Mac OS X

[Andreas Färber]

Am 01.11.2011 10:39, schrieb Eric Sunshine:
> qemu-barrier.h tests if macro __powerpc__ is defined, however, the
> preprocessor on PowerPC Mac OS X defines only __POWERPC__, not
> __powerpc__.

> Resolve by testing instead for qemu-provided _ARCH_PPC.

This part is actually wrong: _ARCH_PPC is compiler-provided.

> 
> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>

I currently don't have access to my ppc64 box, so

Reviewed-by: Andreas Färber <andreas.faerber@web.de>

Next time please cc malc (TCG ppc) and me (Darwin) on this.

Thanks,
Andreas

> ---
> 
> The anomalous __powerpc__ test appears only in qemu-barrier.h.
> No other source files reference this name.
> 
> Cc: David Gibson <david@gibson.dropbear.id.au>
> 
>  qemu-barrier.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/qemu-barrier.h b/qemu-barrier.h
> index 735eea6..c11bb2b 100644
> --- a/qemu-barrier.h
> +++ b/qemu-barrier.h
> @@ -14,7 +14,7 @@
>   */
>  #define smp_wmb()   barrier()
>  
> -#elif defined(__powerpc__)
> +#elif defined(_ARCH_PPC)
>  
>  /*
>   * We use an eieio() for a wmb() on powerpc.  This assumes we don't