From patchwork Fri Jan 11 09:18:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 155312 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp348619jaa; Fri, 11 Jan 2019 01:19:51 -0800 (PST) X-Google-Smtp-Source: ALg8bN4WKM2d5M/bH0qtME+82hA1u0XXqV/NRyUJT7GxYKc/quLQL7EK5gXCTx3wzcdSGija6gyk X-Received: by 2002:a63:4c4e:: with SMTP id m14mr10534193pgl.173.1547198391173; Fri, 11 Jan 2019 01:19:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547198391; cv=none; d=google.com; s=arc-20160816; b=YnU+x39m5u650YfNSAYlkP/4gzLKNq95QUpS1/4RBeJdogRjULpOBh3TsKofMItsAQ P9KARIviMTkUZsfxlxViDe8kvyf2rOZ+vuYZXDfR0iOccgRkE5AB7m6yV9ggW/m37GOI Z/im9NeCvNSg4eudpf2YuUlJHa2YSnEW/1PSuoEFW3Eurq59CsT4I1kSMSp5z9gPjyeV rjfHk99qCGi57bOg+gzgoA1blCj2+MSpyYuVuhiCyYVjJW6jdOUfvWtVu7ircoH9E7JQ 2MBZU5wjUlaZLbo+54HL7EX5j9RVeMsKWe6yca3JixWalEz+Utqaq5BP7TrslQN1hG5r ovLw== 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; bh=L0gFzijA0pMSry8KkrGmKcBeXwn0RuYRJlNQgHdkMf4=; b=I7nk/U15TCNqy6WGx3i62eOglsQ+uprIQZkB/U7sFo/Wh1CSDOTYrkPxjKePFvEpcT OH4fS1jSLoM+N55ZKPt8FWRoesCLkT7VnQlyyt2UIRdnouoX0z9MpBIMuJk19JfT3GcX moBnccFAkwrtyMH5RBUOgd26oO3NsjXsU27bAsi18C7mhiAHCyRbBYTy3dDSDB8lSEi8 T5rZzGNiksOMZyQ3f5WRYTYRE5WYG/JKON87I+lp6ep3gn0yS6yx/Bod43uUy2oKukZz sp/OWo8dFWPUBobRc8byrWexEPfrzrVire8XKYmM6sdL0T55DaMiulBvba1et+OT0r/1 9iCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=gYkyiog0; 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 bg7si80507plb.149.2019.01.11.01.19.50; Fri, 11 Jan 2019 01:19:51 -0800 (PST) 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=gYkyiog0; 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 S1731518AbfAKJTu (ORCPT + 31 others); Fri, 11 Jan 2019 04:19:50 -0500 Received: from conuserg-10.nifty.com ([210.131.2.77]:36610 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730790AbfAKJTt (ORCPT ); Fri, 11 Jan 2019 04:19:49 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x0B9J6oI028675; Fri, 11 Jan 2019 18:19:07 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x0B9J6oI028675 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1547198347; bh=L0gFzijA0pMSry8KkrGmKcBeXwn0RuYRJlNQgHdkMf4=; h=From:To:Cc:Subject:Date:From; b=gYkyiog0LnHcKYmbQUB/d+zVerxeHSYtmIzIrNgii/IujcjU/9rrgpi1Tcc1R7w6B h9Zs8v8uqMEtNI0rdSHqZJU89sBTLKgPIda2xLsyum+jWwe0NSbyH1/U0rA2nN/vxL 1RRQ7YD13ajrqhG52rD996ZNdBMSx7L7894Sv6q3dp3gR2ObwNiuKhMVWExRUP3wrv qXeyEU6pJ+qsmYApIk/mrFQX6wmqEcr3PndQD8qzlwtuXBqqijy/hnkZln20mOiwcg 6oC/cKDSSX6zPA4jPBdGnoyfsQ4jCMF/LT4GopwTRhBsuA3e3ieOhPcqIza4B/8MUN 9uRVqBeHmKAyA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Kees Cook , kernel-hardening@lists.openwall.com, Emese Revfy , Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] kbuild: clean up hostprogs rules with hostld_flags and hostld_libs Date: Fri, 11 Jan 2019 18:18:46 +0900 Message-Id: <1547198328-26359-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 Add hostld_flags and hostld_libs shorthands. No function change. Signed-off-by: Masahiro Yamada --- scripts/Makefile.host | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) -- 2.7.4 Acked-by: Kees Cook diff --git a/scripts/Makefile.host b/scripts/Makefile.host index 0393f75..f2e15de 100644 --- a/scripts/Makefile.host +++ b/scripts/Makefile.host @@ -78,23 +78,26 @@ endif hostc_flags = -Wp,-MD,$(depfile) $(__hostc_flags) hostcxx_flags = -Wp,-MD,$(depfile) $(__hostcxx_flags) +hostld_flags = $(KBUILD_HOSTLDFLAGS) +hostld_libs = $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + ##### # Compile programs on the host # Create executable from a single .c file # host-csingle -> Executable quiet_cmd_host-csingle = HOSTCC $@ - cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(KBUILD_HOSTLDFLAGS) -o $@ $< \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + cmd_host-csingle = $(HOSTCC) $(hostc_flags) $(hostld_flags) -o $@ $< \ + $(hostld_libs) $(host-csingle): $(obj)/%: $(src)/%.c FORCE $(call if_changed_dep,host-csingle) # Link an executable based on list of .o files, all plain c # host-cmulti -> executable quiet_cmd_host-cmulti = HOSTLD $@ - cmd_host-cmulti = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -o $@ \ + cmd_host-cmulti = $(HOSTCC) $(hostld_flags) -o $@ \ $(addprefix $(obj)/,$($(@F)-objs)) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + $(hostld_libs) $(host-cmulti): FORCE $(call if_changed,host-cmulti) $(call multi_depend, $(host-cmulti), , -objs) @@ -109,10 +112,10 @@ $(host-cobjs): $(obj)/%.o: $(src)/%.c FORCE # Link an executable based on list of .o files, a mixture of .c and .cc # host-cxxmulti -> executable quiet_cmd_host-cxxmulti = HOSTLD $@ - cmd_host-cxxmulti = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -o $@ \ + cmd_host-cxxmulti = $(HOSTCXX) $(hostld_flags) -o $@ \ $(foreach o,objs cxxobjs,\ $(addprefix $(obj)/,$($(@F)-$(o)))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + $(hostld_libs) $(host-cxxmulti): FORCE $(call if_changed,host-cxxmulti) $(call multi_depend, $(host-cxxmulti), , -objs -cxxobjs) @@ -143,9 +146,9 @@ $(host-cxxshobjs): $(obj)/%.o: $(src)/%.c FORCE # Link a shared library, based on position independent .o files # *.o -> .so shared library (host-cshlib) quiet_cmd_host-cshlib = HOSTLLD -shared $@ - cmd_host-cshlib = $(HOSTCC) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ + cmd_host-cshlib = $(HOSTCC) $(hostld_flags) -shared -o $@ \ $(addprefix $(obj)/,$($(@F:.so=-objs))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + $(hostld_libs) $(host-cshlib): FORCE $(call if_changed,host-cshlib) $(call multi_depend, $(host-cshlib), .so, -objs) @@ -153,9 +156,9 @@ $(call multi_depend, $(host-cshlib), .so, -objs) # Link a shared library, based on position independent .o files # *.o -> .so shared library (host-cxxshlib) quiet_cmd_host-cxxshlib = HOSTLLD -shared $@ - cmd_host-cxxshlib = $(HOSTCXX) $(KBUILD_HOSTLDFLAGS) -shared -o $@ \ + cmd_host-cxxshlib = $(HOSTCXX) $(hostld_flags) -shared -o $@ \ $(addprefix $(obj)/,$($(@F:.so=-objs))) \ - $(KBUILD_HOSTLDLIBS) $(HOSTLDLIBS_$(@F)) + $(hostld_libs) $(host-cxxshlib): FORCE $(call if_changed,host-cxxshlib) $(call multi_depend, $(host-cxxshlib), .so, -objs)