From patchwork Wed Jun 8 13:11:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 9164591 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A80CA60572 for ; Wed, 8 Jun 2016 13:13:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 98A0826B4A for ; Wed, 8 Jun 2016 13:13:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C93A2823D; Wed, 8 Jun 2016 13:13:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 2250826B4A for ; Wed, 8 Jun 2016 13:13:15 +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 1bAdGX-00021A-Lc; Wed, 08 Jun 2016 13:11:25 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAdGW-0001zs-U5 for xen-devel@lists.xenproject.org; Wed, 08 Jun 2016 13:11:25 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id E6/27-31933-77918575; Wed, 08 Jun 2016 13:11:19 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrGIsWRWlGSWpSXmKPExsXS6fjDS7dMMiL cYPchHYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePu4essBT1iFU9/zGdpYDwn1MXIySEkkCcx c3sLI4jNK2AnMWPTD1YQW0LAUGLf/FVsIDaLgKrE3zczwWrYBNQl2p5tB6rh4BARMJA4dzSpi 5GLg1lgLZPExVl3mUBqhIHiP15cZwSp4RUQlPi7QxgkzAw0vn1dL9MERq5ZCJlZSDIQtpbEw1 +3WCBsbYllC18zg5QzC0hLLP/HARE2lXjRchlNCYjtIPHt1Hb2BYwcqxg1ilOLylKLdA0t9JK KMtMzSnITM3N0DQ2M9XJTi4sT01NzEpOK9ZLzczcxAsOvnoGBcQfj79OehxglOZiURHkV3cPD hfiS8lMqMxKLM+KLSnNSiw8xynBwKEnw+klEhAsJFqWmp1akZeYAIwEmLcHBoyTCGwuS5i0uS MwtzkyHSJ1iVJQS53UASQiAJDJK8+DaYNF3iVFWSpiXkYGBQYinILUoN7MEVf4VozgHo5Iwbx nIFJ7MvBK46a+AFjMBLV5+JBxkcUkiQkqqgXFXJPdFhZtPhVg/H53O4bdoyh/DPW3Oczo2mMe YWx4o+SBwKKPhyb+vP45Vt/Hf1zBIOMcd8SZU+nTy2VU31t9g2F9/7/EHR5mkAz4lgitFVt2/ 7S5/YL6G+3Y17/lT3iv82pXUWq/a5/LnelPyBr0qTmufldIlDE8LAnnvH/Hzmbwie9UprnAll uKMREMt5qLiRAC3LfXluQIAAA== X-Env-Sender: JBeulich@suse.com X-Msg-Ref: server-14.tower-31.messagelabs.com!1465391476!44394899!1 X-Originating-IP: [137.65.248.74] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 25601 invoked from network); 8 Jun 2016 13:11:18 -0000 Received: from prv-mh.provo.novell.com (HELO prv-mh.provo.novell.com) (137.65.248.74) by server-14.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 8 Jun 2016 13:11:18 -0000 Received: from INET-PRV-MTA by prv-mh.provo.novell.com with Novell_GroupWise; Wed, 08 Jun 2016 07:11:16 -0600 Message-Id: <5758359202000078000F3102@prv-mh.provo.novell.com> X-Mailer: Novell GroupWise Internet Agent 14.2.0 Date: Wed, 08 Jun 2016 07:11:14 -0600 From: "Jan Beulich" To: "xen-devel" Mime-Version: 1.0 Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Ian Jackson , Tim Deegan Subject: [Xen-devel] [PATCH] xen: clean up AFLAGS management 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-Virus-Scanned: ClamAV using ClamSMTP No need to force inclusion of xen/config.h - AFLAGS incorporates CFLAGS, which already does this. Also no need to use nested $(filter-out ...) - one of them can deal with any number of patterns. Signed-off-by: Jan Beulich clean up AFLAGS management No need to force inclusion of xen/config.h - AFLAGS incorporates CFLAGS, which already does this. Also no need to use nested $(filter-out ...) - one of them can deal with any number of patterns. Signed-off-by: Jan Beulich --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -64,7 +64,7 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h +AFLAGS-y += -D__ASSEMBLY__ # Clang's built-in assembler can't handle .code16/.code32/.code64 yet AFLAGS-$(clang) += -no-integrated-as @@ -79,7 +79,7 @@ CFLAGS += $(CFLAGS-y) # Most CFLAGS are safe for assembly files: # -std=gnu{89,99} gets confused by #-prefixed end-of-line comments # -flto makes no sense and annoys clang -AFLAGS += $(AFLAGS-y) $(filter-out -std=gnu%,$(filter-out -flto,$(CFLAGS))) +AFLAGS += $(AFLAGS-y) $(filter-out -std=gnu% -flto,$(CFLAGS)) # LDFLAGS are only passed directly to $(LD) LDFLAGS += $(LDFLAGS_DIRECT) Reviewed-by: Andrew Cooper --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -64,7 +64,7 @@ ifneq ($(max_phys_irqs),) CFLAGS-y += -DMAX_PHYS_IRQS=$(max_phys_irqs) endif -AFLAGS-y += -D__ASSEMBLY__ -include $(BASEDIR)/include/xen/config.h +AFLAGS-y += -D__ASSEMBLY__ # Clang's built-in assembler can't handle .code16/.code32/.code64 yet AFLAGS-$(clang) += -no-integrated-as @@ -79,7 +79,7 @@ CFLAGS += $(CFLAGS-y) # Most CFLAGS are safe for assembly files: # -std=gnu{89,99} gets confused by #-prefixed end-of-line comments # -flto makes no sense and annoys clang -AFLAGS += $(AFLAGS-y) $(filter-out -std=gnu%,$(filter-out -flto,$(CFLAGS))) +AFLAGS += $(AFLAGS-y) $(filter-out -std=gnu% -flto,$(CFLAGS)) # LDFLAGS are only passed directly to $(LD) LDFLAGS += $(LDFLAGS_DIRECT)