From patchwork Tue Oct 10 11:43:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 115387 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3649684qgn; Tue, 10 Oct 2017 04:44:48 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCoXz3HYxo8LfgUDyvv3nFy3kNL+Q9Keg/ncEqPUmpwM7napkOPngPm0ZfBnveVQCB6HBXJ X-Received: by 10.98.166.86 with SMTP id t83mr12941373pfe.345.1507635888642; Tue, 10 Oct 2017 04:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507635888; cv=none; d=google.com; s=arc-20160816; b=zo0LclqB+zm+4GQkepTOXNI9gXwQ6mbeH2PzgphviZ4msZSowskeLIZNXKnL6Yn39z t0s9P9cz4xjFbv8yYt1VmIwZSqgy7wKcnBwcT5OvblEOS4oIizmgtr4bjQXe7ZEUZ5qq lGfz6SMqcsRLVjA1SIBV1AIeuan8HssAvb/sUkF9YTScjMokawpe8gecHaYnSTP04k8I 0j4eFCkzn8PCQimCdcpVRLJvxrFvcfdjFhJZgNRctDsHyT95R1TIvEJU+5cMRdJEray/ 8Y8WPQZeGDnvPg8WF/ji3sFxy3fv3KMTLduLBFcnBtu5MANFYpneFiXZsPNbI8vc2T8m idJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=oiQO7U5YokMc+AA80YuF98VsNWn1SGAd0fuv+cQ9jWo=; b=0doIup/E3cm+WPXupx7G3E70Kck2KtszxZh+IJbBHjl3XpxYDxaShUgK6E3hcVJ/Rm LDLaDN3QvkAFJ8slcH33A/8Ka94nk3ZOzKX2EvbaUYm2C0utrvpfGe4uTjlrbZ3Lf06H KeJKwohhP6F/PA7klimbb0EFznwi0qPkC3BJieHL+uJ5PJwP9RHJWA9wZJC3++B2In4F A2kXrsiDHTUy5uoTWAxcUDdo2oOt9e+mM8eGfWkj8IKEfEjedNjEl3Qf9aKSYikLmMxh 96kaOP0S+bN214sg4JT/TS5pZzu/rV/wT2fhogtVlzyda6bEFqAQqxHYaOnFcrYfxe3C LuNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=p+7kvYnW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k186si8205223pgd.480.2017.10.10.04.44.48; Tue, 10 Oct 2017 04:44:48 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=p+7kvYnW; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755866AbdJJLoo (ORCPT + 26 others); Tue, 10 Oct 2017 07:44:44 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:19345 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755434AbdJJLon (ORCPT ); Tue, 10 Oct 2017 07:44:43 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id v9ABhRfA001255; Tue, 10 Oct 2017 20:43:28 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com v9ABhRfA001255 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1507635808; bh=oiQO7U5YokMc+AA80YuF98VsNWn1SGAd0fuv+cQ9jWo=; h=From:To:Cc:Subject:Date:From; b=p+7kvYnWGLXyo6hmg96uez63TioQwEF/PR4agQhdeKW+o8SldzXfEtj0rMnsK+GLW fw9gpAX8j2gDa1fxES5YKS4j0MvbyeHR82hu89SAzEY6Y0BLdw/RJ0h1ytiseeaD1w tLzc8tgXJ/NANEqhbDdv6X9revQf9xX7ElditY6xgT91ho9mk53se2BWG1lMa1skwM 9sOZB1gHByLl3O85c2wlQcMo9IU+VL0eYaAHlLAuSm/ixNeAxguyRGB3LRZs661SAi mK2EJNrwuEQeGElm4PWA46aRO1Pn/lZKSC+TxWKvVhC25+6JD9O23sodzMuZeqtXGo QEP3fN+5M5Ujg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Sam Ravnborg , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: remove KBUILD_SUBDIR_ASFLAGS and KBUILD_SUBDIR_CCFLAGS Date: Tue, 10 Oct 2017 20:43:21 +0900 Message-Id: <1507635801-30561-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Accumulate subdir-{cc,as}flags-y directly to KBUILD_{A,C}FLAGS. Remove KBUILD_SUBDIR_{AS,CC}FLAGS. Signed-off-by: Masahiro Yamada --- scripts/Makefile.lib | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.7.4 Reviewed-by: Cao jin diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 9bbb019..bc63f17a 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -5,8 +5,8 @@ cppflags-y += $(EXTRA_CPPFLAGS) ldflags-y += $(EXTRA_LDFLAGS) # flags that take effect in current and sub directories -export KBUILD_SUBDIR_ASFLAGS := $(KBUILD_SUBDIR_ASFLAGS) $(subdir-asflags-y) -export KBUILD_SUBDIR_CCFLAGS := $(KBUILD_SUBDIR_CCFLAGS) $(subdir-ccflags-y) +KBUILD_AFLAGS += $(subdir-asflags-y) +KBUILD_CFLAGS += $(subdir-ccflags-y) # Figure out what we need to build from the various variables # =========================================================================== @@ -94,10 +94,10 @@ basename_flags = -DKBUILD_BASENAME=$(call name-fix,$(basetarget)) modname_flags = $(if $(filter 1,$(words $(modname))),\ -DKBUILD_MODNAME=$(call name-fix,$(modname))) -orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(KBUILD_SUBDIR_CCFLAGS) \ +orig_c_flags = $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) \ $(ccflags-y) $(CFLAGS_$(basetarget).o) _c_flags = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags)) -orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(KBUILD_SUBDIR_ASFLAGS) \ +orig_a_flags = $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) \ $(asflags-y) $(AFLAGS_$(basetarget).o) _a_flags = $(filter-out $(AFLAGS_REMOVE_$(basetarget).o), $(orig_a_flags)) _cpp_flags = $(KBUILD_CPPFLAGS) $(cppflags-y) $(CPPFLAGS_$(@F))