diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2012-05-27 16:21:02 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2012-05-29 11:38:07 +0200 |
| commit | f283edc4827f6bfa82240e36433d7184ab106b0f (patch) | |
| tree | 3bca6d14081ed6a94ec9bd97575b9cdd99f78937 | |
| parent | 24f50d7ea5896a30b0e78f68884586bb8b40ff97 (diff) | |
| download | focaccia-qemu-f283edc4827f6bfa82240e36433d7184ab106b0f.tar.gz focaccia-qemu-f283edc4827f6bfa82240e36433d7184ab106b0f.zip | |
arch_init: Fix AltiVec build on Darwin/ppc
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 in 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> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch_init.c b/arch_init.c index 988adcae07..a9e8b7442b 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 |