From patchwork Tue Oct 31 18:11:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 160302 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b90f:0:b0:403:3b70:6f57 with SMTP id t15csp424919vqg; Tue, 31 Oct 2023 11:12:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGtdkYuWRKPZ+ny+u8JYvHrNrgimh7tGtyNNThjYBJU20XNHtFP45kYQgLfXYygSsxVFhp0 X-Received: by 2002:a05:6a20:1450:b0:133:1d62:dcbd with SMTP id a16-20020a056a20145000b001331d62dcbdmr414982pzi.28.1698775948704; Tue, 31 Oct 2023 11:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698775948; cv=none; d=google.com; s=arc-20160816; b=rDNe0KlpDx2KOsgMR2jJakpbtDYfhrO5TO+HQatzK902ElG95NLAOQzjg4N6m+Qs2l 6GZyyMtLgYWip1HEQrHMiRsq24kR0od9fCO0Kyuc1iDfG5LZvJ48o9NiCOHQxEIAe0F4 AGWt4zpOX5XFnKYKuYECJ09QuCC7Hnrj/F8WjFu+URzt6C6n/h6wemkxqR8hJpCmEivR BiKTP4d7Ydg5L8cDdd8iub8TciXftQSKurzmd+6TzgC1jEdLU55V49oPgks6alI5ouxo U9YO+tTu/4yZFrZUGcmSmKerls5TDHxzz38tYY8FR7ZOxWdp7h6jZvisADpIRj1ufJ0S IsLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ulG5dTWLMoLRWJubhAXEUGEs7ieds792F4+4d9K4Fm4=; fh=aYAt60baM9+EL++WsOQBfp096z512HSUNaroIg+aPQM=; b=f1tp2OpH5vp75VtoJT22KV9WmEr/6k3rnbLkhMjShoxYVeXMryiaMVp5JAEuFze7MW pu4P3EHo3ROCqtW+itmwK1qnz14u4sktw+SjtKQc8YObPLwBuFe8oMD/Dru+Zd+PWTFO WD6eiHkivRA2aewLMQfHnUr2KXdRIQTRantMPLBUbRTgY8Z6lKaiuXEo3e5i3VIO+0+A Twj58idq4J79peMVv7LChd3JpLao3ucN1H2MWpx3KN/++5N44dM6+p7IJmvskc/GsYqI dzL90bxWAXdDgR4ugD9+9TA/Gr2NoIEbsc+tFR2DtnLc++9uiMuhdXMh97DSoNggFBdv 5K0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dcgLn6vS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id v202-20020a6361d3000000b005b9600b9f4asi1313770pgb.228.2023.10.31.11.12.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 11:12:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=dcgLn6vS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 8C496801B1B7; Tue, 31 Oct 2023 11:12:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376645AbjJaSMM (ORCPT + 33 others); Tue, 31 Oct 2023 14:12:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1376632AbjJaSMI (ORCPT ); Tue, 31 Oct 2023 14:12:08 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5C96A3; Tue, 31 Oct 2023 11:12:06 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17B8EC433C7; Tue, 31 Oct 2023 18:12:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698775926; bh=z2kKP0Kx2dr57rizxfyHv38jeggUfLgco7MlYnA5gyE=; h=From:To:Cc:Subject:Date:From; b=dcgLn6vSn6gm14DKigv2Fh7/WSvAoDVEs2UjDpd6TDtwuq09AUWgxPLuVALGPSarp 34pPV1o98F2CmMGKv1QjRC4MCgbmp/iwVdbMpKZNrqe83luuMxboZhO4UfB6+8OyjL rBdjAcFNYmzjGITP4tpy8+ZYse6BTtaook47cxniePiZgjOpyUL3gwJdpKbLmKrrC3 fCvmcd7fUbgKqtBVmvk584Q2SSTL1GhmmLHlUDbGIQgqqQJ7fq2hpGuwWQR15J4Lv+ /x4umGUFK8eagzBKHuMAZYqSWkWwFK8Vr0nuFjZaIJgDFvRTSYOZrbBZCzC5GmJjA2 ZLXnUswjZ8xSg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Jonathan Corbet , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-doc@vger.kernel.org Subject: [PATCH] kbuild: support 'userldlibs' syntax Date: Wed, 1 Nov 2023 03:11:57 +0900 Message-Id: <20231031181157.704314-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Tue, 31 Oct 2023 11:12:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781295689081074778 X-GMAIL-MSGID: 1781295689081074778 This syntax is useful to specify libraries linked to all userspace programs in the Makefile. Signed-off-by: Masahiro Yamada --- Documentation/kbuild/makefiles.rst | 4 ++++ scripts/Makefile.userprogs | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Documentation/kbuild/makefiles.rst b/Documentation/kbuild/makefiles.rst index d88d4f0f4f89..e9299971220a 100644 --- a/Documentation/kbuild/makefiles.rst +++ b/Documentation/kbuild/makefiles.rst @@ -937,6 +937,10 @@ Example:: # net/bpfilter/Makefile bpfilter_umh-userldflags += -static +To specify libraries linked to a userspace program, you can use +``-userldlibs``. The ``userldlibs`` syntax specifies libraries +linked to all userspace programs created in the current Makefile. + When linking bpfilter_umh, it will be passed the extra option -static. From command line, :ref:`USERCFLAGS and USERLDFLAGS ` will also be used. diff --git a/scripts/Makefile.userprogs b/scripts/Makefile.userprogs index fb415297337a..f3a7e1ef3753 100644 --- a/scripts/Makefile.userprogs +++ b/scripts/Makefile.userprogs @@ -19,19 +19,19 @@ user-cobjs := $(addprefix $(obj)/, $(user-cobjs)) user_ccflags = -Wp,-MMD,$(depfile) $(KBUILD_USERCFLAGS) $(userccflags) \ $($(target-stem)-userccflags) user_ldflags = $(KBUILD_USERLDFLAGS) $(userldflags) $($(target-stem)-userldflags) +user_ldlibs = $(userldlibs) $($(target-stem)-userldlibs) # Create an executable from a single .c file quiet_cmd_user_cc_c = CC [U] $@ cmd_user_cc_c = $(CC) $(user_ccflags) $(user_ldflags) -o $@ $< \ - $($(target-stem)-userldlibs) + $(user_ldlibs) $(user-csingle): $(obj)/%: $(src)/%.c FORCE $(call if_changed_dep,user_cc_c) # Link an executable based on list of .o files quiet_cmd_user_ld = LD [U] $@ cmd_user_ld = $(CC) $(user_ldflags) -o $@ \ - $(addprefix $(obj)/, $($(target-stem)-objs)) \ - $($(target-stem)-userldlibs) + $(addprefix $(obj)/, $($(target-stem)-objs)) $(user_ldlibs) $(user-cmulti): FORCE $(call if_changed,user_ld) $(call multi_depend, $(user-cmulti), , -objs)