From patchwork Sun May 27 15:37:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 161553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BFDF8B6EF1 for ; Mon, 28 May 2012 01:37:57 +1000 (EST) Received: from localhost ([::1]:41773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYfXX-0007br-6A for incoming@patchwork.ozlabs.org; Sun, 27 May 2012 11:37:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYfXQ-0007bb-Dm for qemu-devel@nongnu.org; Sun, 27 May 2012 11:37:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SYfXO-0001EE-M1 for qemu-devel@nongnu.org; Sun, 27 May 2012 11:37:47 -0400 Received: from mout.web.de ([212.227.15.3]:50559) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SYfXO-0001E3-D6; Sun, 27 May 2012 11:37:46 -0400 Received: from af.local ([62.157.78.131]) by smtp.web.de (mrweb002) with ESMTPA (Nemesis) id 0MfHQo-1SN3bl3zpa-00OpWP; Sun, 27 May 2012 17:37:41 +0200 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sun, 27 May 2012 17:37:39 +0200 Message-Id: <1338133059-43484-1-git-send-email-andreas.faerber@web.de> X-Mailer: git-send-email 1.7.5.3 MIME-Version: 1.0 X-Provags-ID: V02:K0:vFvNc0Tkp0L1Mc78hwYxNWcaVPIthAHzanVESFWsTl0 wRfTYZtEZY+fKvnf4je3JHW3ctGqUOADvOSRccBkYmUZW4xpiQ k0b7RlbiWwabzIJd4N1P2Gqa9iS0qJzrENgp0AaNREg1fp4HGZ V5E2cfrSlf7j/J8U/mCq8ifK0/6UGcTkfvqGUhPunRuZzr6y/U tou+nMaQCSRdXThvzvKVA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.15.3 Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , qemu-ppc , Eduardo Habkost , Alexander Graf Subject: [Qemu-devel] [PATCH for-1.1] arch_init: Fix AltiVec build on Darwin/ppc X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Cc: Eduardo Habkost Cc: Paolo Bonzini Cc: Alexander Graf Cc: qemu-ppc Reviewed-by: Paolo Bonzini --- 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 #define VECTYPE __m128i