Re: [Qemu-devel] [PATCH for-1.1] arch_init: Fix AltiVec build on Darwin/ppc

2012-05-28 Thread Paolo Bonzini
Il 27/05/2012 17:37, Andreas Färber ha scritto:
 GCC's altivec.h may in a !__APPLE_ALTIVEC__ code path redefine bool,
 leading to type mismatches. altivec.h recommends to #undef for C++
 compatibility, but doing so on C leads to bool remaining undefined.

Reviewed-by: Paolo Bonzini pbonz...@redhat.com

Paolo



[Qemu-devel] [PATCH for-1.1] arch_init: Fix AltiVec build on Darwin/ppc

2012-05-27 Thread Andreas Färber
Commit f29a56147b66845914d0a645bf9b4c5bb9a6af57 (implement
-no-user-config command-line option (v3)) introduced uses of bool
in arch_init.c. Shortly before that usage is support code for
AltiVec (conditional to __ALTIVEC__).

GCC's altivec.h may in a !__APPLE_ALTIVEC__ code path redefine bool,
leading to type mismatches. altivec.h recommends to #undef for C++
compatibility, but doing so on C leads to bool remaining undefined.

Fix by redefining bool to _Bool as mandated for stdbool.h by POSIX.

Signed-off-by: Andreas Färber andreas.faer...@web.de
Cc: Eduardo Habkost ehabk...@redhat.com
Cc: Paolo Bonzini pbonz...@redhat.com
Cc: Alexander Graf ag...@suse.de
Cc: qemu-ppc qemu-...@nongnu.org
---
 arch_init.c |4 
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch_init.c b/arch_init.c
index 988adca..a9e8b74 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -100,6 +100,10 @@ const uint32_t arch_type = QEMU_ARCH;
 #define VECTYPEvector unsigned char
 #define SPLAT(p)   vec_splat(vec_ld(0, p), 0)
 #define ALL_EQ(v1, v2) vec_all_eq(v1, v2)
+/* altivec.h may redefine the bool macro as vector type.
+ * Reset it to POSIX semantics. */
+#undef bool
+#define bool _Bool
 #elif defined __SSE2__
 #include emmintrin.h
 #define VECTYPE__m128i
-- 
1.7.5.3




Re: [Qemu-devel] [PATCH for-1.1] arch_init: Fix AltiVec build on Darwin/ppc

2012-05-27 Thread Andreas Färber
Am 27.05.2012 17:37, schrieb Andreas Färber:
 Commit f29a56147b66845914d0a645bf9b4c5bb9a6af57 (implement
 -no-user-config command-line option (v3)) introduced uses of bool
 in arch_init.c. Shortly before that usage is support code for
 AltiVec (conditional to __ALTIVEC__).
 
 GCC's altivec.h may in a !__APPLE_ALTIVEC__ code path redefine bool,
 leading to type mismatches. altivec.h recommends to #undef for C++
 compatibility, but doing so on C leads to bool remaining undefined.

in C - please fix when applying.

Thanks,
Andreas

 Fix by redefining bool to _Bool as mandated for stdbool.h by POSIX.
 
 Signed-off-by: Andreas Färber andreas.faer...@web.de
 Cc: Eduardo Habkost ehabk...@redhat.com
 Cc: Paolo Bonzini pbonz...@redhat.com
 Cc: Alexander Graf ag...@suse.de
 Cc: qemu-ppc qemu-...@nongnu.org

P.S. No such errors with gcc (SUSE Linux) 4.6.3, even with
--extra-cflags=-maltivec, so I'm guessing __bool differs.

 ---
  arch_init.c |4 
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/arch_init.c b/arch_init.c
 index 988adca..a9e8b74 100644
 --- a/arch_init.c
 +++ b/arch_init.c
 @@ -100,6 +100,10 @@ const uint32_t arch_type = QEMU_ARCH;
  #define VECTYPEvector unsigned char
  #define SPLAT(p)   vec_splat(vec_ld(0, p), 0)
  #define ALL_EQ(v1, v2) vec_all_eq(v1, v2)
 +/* altivec.h may redefine the bool macro as vector type.
 + * Reset it to POSIX semantics. */
 +#undef bool
 +#define bool _Bool
  #elif defined __SSE2__
  #include emmintrin.h
  #define VECTYPE__m128i

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg