From patchwork Mon Apr 22 12:32:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 16317 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f200.google.com (mail-ye0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CC08923919 for ; Mon, 22 Apr 2013 12:33:22 +0000 (UTC) Received: by mail-ye0-f200.google.com with SMTP id r11sf10125523yen.3 for ; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-beenthere:x-received:received-spf:x-received :x-forwarded-to:x-forwarded-for:delivered-to:x-received:received-spf :message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:x-enigmail-version:x-scanned-by :x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=2rYPRWuc3cUncftriV1byWM47hZxNs/hKkkdVtNxB5c=; b=HtIvo/bjsRYn3WgEC0cVKcrf0n4D7gjisKLiaOQJqmc9Az0GYcgZNbXkOsevErEwns L9+45h3cPeIf5o58juDvorUttP/u48bkXpgP+bFQ5GSB3QbntdJegj6CM6O2j1svHxuN Vyryiitljoz0TXkpK/1u1gskSPQbP8HNHSLuADZ1rN+ZW941Di1oU8UPMPopbSZSDbDK 6M4UnghrKlQBit9m9j1w73W7pmd3dWIakxJJ6wDSfxfw3ZIgL1k4eDQDclyzbyTyfvuD wruVM53Ue5bbpNz7pU9fiCWTlP+vNnCFs61JnNOPodcSXgeEY7eDVsHRQz6RPmaPnV1i N40Q== X-Received: by 10.236.89.65 with SMTP id b41mr12921874yhf.49.1366633956487; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.127.111 with SMTP id nf15ls3302776qeb.25.gmail; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) X-Received: by 10.52.32.194 with SMTP id l2mr15896200vdi.14.1366633956362; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) Received: from mail-vb0-x235.google.com (mail-vb0-x235.google.com [2607:f8b0:400c:c02::235]) by mx.google.com with ESMTPS id ex4si15814297vdb.14.2013.04.22.05.32.36 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 05:32:36 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::235; Received: by mail-vb0-f53.google.com with SMTP id i3so5717394vbh.40 for ; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) X-Received: by 10.58.173.36 with SMTP id bh4mr4864854vec.9.1366633956000; Mon, 22 Apr 2013 05:32:36 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp74637veb; Mon, 22 Apr 2013 05:32:35 -0700 (PDT) X-Received: by 10.224.36.6 with SMTP id r6mr15096687qad.84.1366633955271; Mon, 22 Apr 2013 05:32:35 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com. [209.132.183.28]) by mx.google.com with ESMTP id i4si7487421qct.136.2013.04.22.05.32.34; Mon, 22 Apr 2013 05:32:35 -0700 (PDT) Received-SPF: pass (google.com: domain of pbonzini@redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3MCWXin019000 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Apr 2013 08:32:33 -0400 Received: from yakj.usersys.redhat.com (ovpn-112-45.ams2.redhat.com [10.36.112.45]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r3MCWTpk025255; Mon, 22 Apr 2013 08:32:29 -0400 Message-ID: <51752DD3.3070302@redhat.com> Date: Mon, 22 Apr 2013 14:32:19 +0200 From: Paolo Bonzini User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130311 Thunderbird/17.0.4 MIME-Version: 1.0 To: Peter Maydell CC: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= , qemu-devel@nongnu.org, Anthony Liguori , Gerd Hoffmann , patches@linaro.org, Blue Swirl , Stefan Hajnoczi Subject: Re: [Qemu-devel] [PATCH] ui/cocoa.m: Fix recent compile breakage References: <1366226195-10668-1-git-send-email-peter.maydell@linaro.org> <51747056.6080803@web.de> In-Reply-To: X-Enigmail-Version: 1.5.1 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Gm-Message-State: ALoCoQmeq4rkF018Veu9SJc+FvhrsErJbnhtD0lVCv4oAh3w+cp2Zx9l4zXKgn301w6UcFSmx1Dp X-Original-Sender: pbonzini@redhat.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::235 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Il 22/04/2013 13:51, Peter Maydell ha scritto: > On 22 April 2013 00:03, Andreas Färber wrote: >> Even after this has been applied, things are still not building for me. >> >> I'm seeing CC trace/generated-events.o failing with "error: parameter >> name omitted" for trace_apic_local_deliver, trace_usb_xhci_queue_event, >> trace_megasas_msix_raise and trace_spapr_pci_msi_setup, plus a warning >> that trace_event_count is being declared twice. > > I suspect that whatever compiler you're using here treats 'vector' > as a magic word, so when it sees a prototype like > static inline void trace_megasas_msix_raise(int vector) > > it's expecting that 'vector' is an attribute of the type and > it wants "int vector foo", hence the error message. > > You could test this theory by changing all the 'vector's in > trace-events to 'vec' instead and rebuilding. The culprit is likely altivec.h. Something like this should fix it: Paolo diff --git a/include/qemu-common.h b/include/qemu-common.h index 2cfb1f0..6c23b1b 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -436,12 +436,18 @@ /* vector definitions */ #ifdef __ALTIVEC__ #include -#define VECTYPE vector unsigned char +/* The altivec.h header says we're allowed to undef these for + * C++ compatibility. Here we don't care about C++, but we + * undef them anyway to avoid namespace pollution. + */ +#undef vector +#undef pixel +#undef bool +#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