From patchwork Thu Nov 29 03:56:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10703895 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 320BC13BB for ; Thu, 29 Nov 2018 03:57:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2665C2E811 for ; Thu, 29 Nov 2018 03:57:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1A0212E838; Thu, 29 Nov 2018 03:57:27 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from mother.openwall.net (mother.openwall.net [195.42.179.200]) by mail.wl.linuxfoundation.org (Postfix) with SMTP id BC2732E811 for ; Thu, 29 Nov 2018 03:57:25 +0000 (UTC) Received: (qmail 17974 invoked by uid 550); 29 Nov 2018 03:57:24 -0000 Mailing-List: contact kernel-hardening-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-ID: Delivered-To: mailing list kernel-hardening@lists.openwall.com Received: (qmail 17930 invoked from network); 29 Nov 2018 03:57:22 -0000 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com wAT3uW9h014059 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1543463793; bh=jenL7MJF+aDHOcehc6CyDTxYWkvnIjepvb/UDlh5RcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gls3K74hUYeFBajD/srbmUekOfwyf79oeV0RuqBsogpOgjktRfJpaUWgwNgonYyoY CCiyzQI3NL5MScs24puNrvOyWCDRl41gx1lEfKnraZdfRVOWt5FFmm/YanIbVELqsk bdV0d0HuhiU+pWf8d72e1mDNngFZ3QM2odfId5aYQ8j73eXQ5wpdxfe4YEXIOni4LZ iOc8xoZjLnd9sQ4je6ypicCfsx2Xd4rZQ0W2AwMGBdN0FRP9M3wmNfi4/uG6uDEiHm XY63uoosa+E3nrqR2mQptVbZQLvCFscp+T4iwb3biyM/GfYwo2s2yj24ygdDZBF3SR cHX1ElhOIX7Lg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kees Cook , Emese Revfy , Masahiro Yamada , kernel-hardening@lists.openwall.com, linux-kernel@vger.kernel.org, Michal Marek Subject: [PATCH v2 2/2] kbuild: descend into scripts/gcc-plugins/ via scripts/Makefile Date: Thu, 29 Nov 2018 12:56:31 +0900 Message-Id: <1543463791-18391-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543463791-18391-1-git-send-email-yamada.masahiro@socionext.com> References: <1543463791-18391-1-git-send-email-yamada.masahiro@socionext.com> X-Virus-Scanned: ClamAV using ClamSMTP Now that 'archprepare' depends on 'scripts', Kbuild can descend into scripts/gcc-plugins in a more standard way. Signed-off-by: Masahiro Yamada Reviewed-by: Kees Cook --- Changes in v2: - It turned out UML + CONFIG_GCC_PLUGINS is broken for a long time. https://patchwork.kernel.org/patch/10703853/ Rebased on the top of the fix-up Makefile | 2 +- scripts/Makefile | 3 ++- scripts/Makefile.gcc-plugins | 8 -------- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 9eb3f4f..c1f87cf 100644 --- a/Makefile +++ b/Makefile @@ -1112,7 +1112,7 @@ prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h macroprepare: prepare1 archmacros -archprepare: archheaders archscripts macroprepare scripts gcc-plugins +archprepare: archheaders archscripts macroprepare scripts prepare0: archprepare $(Q)$(MAKE) $(build)=scripts/mod diff --git a/scripts/Makefile b/scripts/Makefile index b48259d..feb1f71 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -36,9 +36,10 @@ PHONY += build_unifdef build_unifdef: $(obj)/unifdef @: +subdir-$(CONFIG_GCC_PLUGINS) += gcc-plugins subdir-$(CONFIG_MODVERSIONS) += genksyms subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_GDB_SCRIPTS) += gdb # Let clean descend into subdirs -subdir- += basic dtc kconfig mod package gcc-plugins +subdir- += basic dtc kconfig mod package diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins index 46c5c68..c36f199 100644 --- a/scripts/Makefile.gcc-plugins +++ b/scripts/Makefile.gcc-plugins @@ -49,11 +49,3 @@ KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS) # All enabled GCC plugins are collected here for building below. GCC_PLUGIN := $(gcc-plugin-y) export GCC_PLUGIN - -# Actually do the build, if requested. -PHONY += gcc-plugins -gcc-plugins: scripts_basic -ifdef CONFIG_GCC_PLUGINS - $(Q)$(MAKE) $(build)=scripts/gcc-plugins -endif - @: