Patchwork [for-1.1] arch_init: Fix AltiVec build on Darwin/ppc

login
register
mail settings
Submitter Andreas Färber
Date May 27, 2012, 3:37 p.m.
Message ID <1338133059-43484-1-git-send-email-andreas.faerber@web.de>
Download mbox | patch
Permalink /patch/161553/
State New
Headers show

Comments

Andreas Färber - May 27, 2012, 3:37 p.m.
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.faerber@web.de>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Alexander Graf <agraf@suse.de>
Cc: qemu-ppc <qemu-ppc@nongnu.org>
---
 arch_init.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
Andreas Färber - May 27, 2012, 3:49 p.m.
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.faerber@web.de>
> Cc: Eduardo Habkost <ehabkost@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Alexander Graf <agraf@suse.de>
> Cc: qemu-ppc <qemu-ppc@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 VECTYPE        vector 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
Paolo Bonzini - May 28, 2012, 6:49 a.m.
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 <pbonzini@redhat.com>

Paolo

Patch

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 VECTYPE        vector 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