From patchwork Tue Apr 26 14:52:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 8939681 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D928B9F1D3 for ; Tue, 26 Apr 2016 14:55:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC3AF20120 for ; Tue, 26 Apr 2016 14:55:20 +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 01C0120125 for ; Tue, 26 Apr 2016 14:55:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1av4MF-0007TG-2N; Tue, 26 Apr 2016 14:52:59 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1av4ME-0007T4-85 for xen-devel@lists.xenproject.org; Tue, 26 Apr 2016 14:52:58 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 8E/A6-03651-9C08F175; Tue, 26 Apr 2016 14:52:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrOIsWRWlGSWpSXmKPExsXitHSDve6JBvl wgxtTrSy+b5nM5MDocfjDFZYAxijWzLyk/IoE1ozp0/6wFywXrDjZcZKtgfEXXxcjJ4eEgL9E +5erTCA2m4COxMW5O9m6GDk4RARUJG7vNQAJMwsUS3xd1ccKYgsLpEnMOXGCDcRmEVCVWPGok xmknFfAReJWlyPERF2Jk7s3sYPYnAKuEpsXvAKbLgRUsmTTY7A4r4CgxMmZT1ggxmtKtG7/zQ 5hy0s0b53NDFGvKNE/7wEbxExuidunpzJPYOSfhaR9FpL2WUjaFzAyr2LUKE4tKkst0jU00Us qykzPKMlNzMzRNTQw1stNLS5OTE/NSUwq1kvOz93ECAxABiDYwbhiu+chRkkOJiVR3nt58uFC fEn5KZUZicUZ8UWlOanFhxhlODiUJHhN6oFygkWp6akVaZk5wFiASUtw8CiJ8DaBpHmLCxJzi zPTIVKnGBWlxHmngCQEQBIZpXlwbbD4u8QoKyXMywh0iBBPQWpRbmYJqvwrRnEORiVh3hCQKT yZeSVw018BLWYCWnz5kCzI4pJEhJRUA6Ot+LwZ4hw/2Jbd9f1ww+jj/vscKl8n2ay6dDx0a/S tdWvsExIPCpxw/Hno64eWj17nbado+wftvbzw0NL0J39P/3YSP6spaSjz5KXksYvzTnvm2Myp O706ju1jBY/x+suO5gXnApQLfhrlrOJX6ti5SmuuKtfPxqULSph+hodJKZSn8NzPPuSsxFKck WioxVxUnAgAANQpMboCAAA= X-Env-Sender: prvs=917dd492e=roger.pau@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1461682370!33860613!4 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.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 63097 invoked from network); 26 Apr 2016 14:52:56 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 26 Apr 2016 14:52:56 -0000 X-IronPort-AV: E=Sophos;i="5.24,536,1454976000"; d="scan'208";a="356517665" From: Roger Pau Monne To: Date: Tue, 26 Apr 2016 16:52:15 +0200 Message-ID: <1461682343-20597-7-git-send-email-roger.pau@citrix.com> X-Mailer: git-send-email 2.6.4 (Apple Git-63) In-Reply-To: <1461682343-20597-1-git-send-email-roger.pau@citrix.com> References: <1461682343-20597-1-git-send-email-roger.pau@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Wei Liu , Ian Jackson , Roger Pau Monne Subject: [Xen-devel] [PATCH v2 for-4.7 06/14] xen/tools: fix substitution of __align8__ uint64_t inside of headers 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=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 current seedery doesn't work with BSD sed, so remove the try to match int64_t also (since there's none at the moment). Also, apply the same treatment to all arch headers, currently this is only done to x86_64 headers. Signed-off-by: Roger Pau Monné Reviewed-by: Andrew Cooper Reviewed-by: Doug Goldstein Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Wei Liu --- tools/include/xen-foreign/Makefile | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tools/include/xen-foreign/Makefile b/tools/include/xen-foreign/Makefile index 270a975..e395011 100644 --- a/tools/include/xen-foreign/Makefile +++ b/tools/include/xen-foreign/Makefile @@ -25,18 +25,30 @@ check-headers: checker rm tmp.size arm32.h: mkheader.py structs.py $(ROOT)/arch-arm.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__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 + rm $@.tmp + $(call move-if-changed,$@.tmp2,$@) arm64.h: mkheader.py structs.py $(ROOT)/arch-arm.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__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 + rm $@.tmp + $(call move-if-changed,$@.tmp2,$@) x86_32.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_32.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__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 + rm $@.tmp + $(call move-if-changed,$@.tmp2,$@) x86_64.h: mkheader.py structs.py $(ROOT)/arch-x86/xen-x86_64.h $(ROOT)/arch-x86/xen.h $(ROOT)/xen.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' < $@.tmp > $@.tmp2 + sed 's/(__align8__ \(uint64_t\))/(\1)/g' < $@.tmp > $@.tmp2 rm $@.tmp $(call move-if-changed,$@.tmp2,$@)