From patchwork Wed Mar 9 19:03:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 8548661 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9BBEBC0553 for ; Wed, 9 Mar 2016 19:06:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 94F06202BE for ; Wed, 9 Mar 2016 19:06:30 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 906FD2021A for ; Wed, 9 Mar 2016 19:06:29 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adjOO-0006kx-T9; Wed, 09 Mar 2016 19:03:32 +0000 Received: from mail6.bemta6.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1adjON-0006kr-N4 for xen-devel@lists.xen.org; Wed, 09 Mar 2016 19:03:31 +0000 Received: from [85.158.143.35] by server-3.bemta-6.messagelabs.com id FC/8E-07120-38370E65; Wed, 09 Mar 2016 19:03:31 +0000 X-Env-Sender: prvs=869909abb=Andrew.Cooper3@citrix.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1457550205!673158!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5438 invoked from network); 9 Mar 2016 19:03:28 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 9 Mar 2016 19:03:28 -0000 X-IronPort-AV: E=Sophos;i="5.24,312,1454976000"; d="scan'208";a="344433907" From: Andrew Cooper To: Xen-devel Date: Wed, 9 Mar 2016 19:03:15 +0000 Message-ID: <1457550196-4287-1-git-send-email-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Wei Liu , Andrew Cooper , Ian Jackson , Julien Grall , Stefano Stabellini , Jan Beulich Subject: [Xen-devel] [PATCH v2 1/2] tools/foreign: Avoid using alignment directives when not appropriate X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The foreign header generation blindly replaces 'uint64_t' with '__align8__ uint64_t', to get correct alignment when built as 32bit. This is correct in most circumstances, but Clang objects to two specific uses. * Inside a sizeof() expression * As part of a typecast An example error looks like: /local/xen.git/tools/libxc/../../tools/include/xen/foreign/x86_64.h:204:44: error: 'aligned' attribute ignored when parsing type [-Werror,-Wignored-attributes] __align8__ uint64_t evtchn_mask[sizeof(__align8__ uint64_t) * 8]; ^~~~~~~~~~ /local/xen.git/tools/libxc/../../tools/include/xen/foreign/x86_64.h:13:36: note: expanded from macro '__align8__' ^~~~~~~~~~~ This sedary is sufficient to fix all the bad examples without touching any of the legitimate uses, and is more simple than teaching mkheader.py how to parse C. Signed-off-by: Andrew Cooper Acked-by: Wei Liu Reviewed-by: Jan Beulich --- CC: Ian Jackson CC: Wei Liu CC: Stefano Stabellini CC: Julien Grall CC: Jan Beulich v2: Use .tmp file. Make sedary able to deal with int64_t --- tools/include/xen-foreign/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 80a446a..bb09c93 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -34,7 +34,10 @@ x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.h $(ROOT)/arch-x86/ $(PYTHON) $< $* $@ $(filter %.h,$^) x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.h - $(PYTHON) $< $* $@ $(filter %.h,$^) + $(PYTHON) $< $* $@.tmp $(filter %.h,$^) + #Avoid mixing an alignment directive with a uint64_t cast or sizeof expression + sed 's/(__align8__ \(u\?int64_t\))/(\1)/g' -i $@.tmp + $(call move-if-changed,$@.tmp,$@) checker.c: mkchecker.py structs.py $(PYTHON) $< $@ $(architectures)