From nobody Thu May 7 13:10:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81CE6C433F5 for ; Sat, 28 May 2022 15:46:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238037AbiE1PqO (ORCPT ); Sat, 28 May 2022 11:46:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237924AbiE1PqJ (ORCPT ); Sat, 28 May 2022 11:46:09 -0400 Received: from 1wt.eu (wtarreau.pck.nerim.net [62.212.114.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1FCD0183A8 for ; Sat, 28 May 2022 08:46:06 -0700 (PDT) Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id 24SFjqaI008307; Sat, 28 May 2022 17:45:52 +0200 From: Willy Tarreau To: Linus Torvalds Cc: "Paul E . McKenney" , linux-kernel@vger.kernel.org, Willy Tarreau Subject: [PATCH 1/3] tools/nolibc: fix the makefile to also work as "make -C tools ..." Date: Sat, 28 May 2022 17:45:44 +0200 Message-Id: <20220528154546.8261-2-w@1wt.eu> X-Mailer: git-send-email 2.17.5 In-Reply-To: <20220528154546.8261-1-w@1wt.eu> References: <20220528154546.8261-1-w@1wt.eu> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" As reported by Linus, the nolibc's makefile is currently broken when invoked as per the documented method (make -C tools nolibc_), because it now relies on the ARCH and OUTPUT variables that are not set in this case. This patch addresses this by sourcing subarch.include, and by presetting OUTPUT to the current directory if not set. This is sufficient to make the commands work both as a standalone target and as a tools/ sub-target. Signed-off-by: Willy Tarreau --- tools/include/nolibc/Makefile | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile index 7a16d917c185..e8bac6ef3653 100644 --- a/tools/include/nolibc/Makefile +++ b/tools/include/nolibc/Makefile @@ -7,6 +7,22 @@ ifeq ($(srctree),) srctree :=3D $(patsubst %/tools/include/,%,$(dir $(CURDIR))) endif =20 +# when run as make -C tools/ nolibc_ the arch is not set +ifeq ($(ARCH),) +include $(srctree)/scripts/subarch.include +ARCH =3D $(SUBARCH) +endif + +# OUTPUT is only set when run from the main makefile, otherwise +# it defaults to this nolibc directory. +OUTPUT ?=3D $(CURDIR)/ + +ifeq ($(V),1) +Q=3D +else +Q=3D@ +endif + nolibc_arch :=3D $(patsubst arm64,aarch64,$(ARCH)) arch_file :=3D arch-$(nolibc_arch).h all_files :=3D ctype.h errno.h nolibc.h signal.h std.h stdio.h stdlib.h st= ring.h \ @@ -36,7 +52,7 @@ headers: =20 headers_standalone: headers $(Q)$(MAKE) -C $(srctree) headers - $(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=3D$(OUTPUT)/sy= sroot + $(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=3D$(OUTPUT)sys= root =20 clean: $(call QUIET_CLEAN, nolibc) rm -rf "$(OUTPUT)sysroot" --=20 2.17.5 From nobody Thu May 7 13:10:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC826C433EF for ; Sat, 28 May 2022 15:46:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239195AbiE1PqR (ORCPT ); Sat, 28 May 2022 11:46:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238649AbiE1PqP (ORCPT ); Sat, 28 May 2022 11:46:15 -0400 Received: from 1wt.eu (wtarreau.pck.nerim.net [62.212.114.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id A3157186C0 for ; Sat, 28 May 2022 08:46:14 -0700 (PDT) Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id 24SFjqm4008308; Sat, 28 May 2022 17:45:52 +0200 From: Willy Tarreau To: Linus Torvalds Cc: "Paul E . McKenney" , linux-kernel@vger.kernel.org, Willy Tarreau Subject: [PATCH 2/3] tools/nolibc: make the default target build the headers Date: Sat, 28 May 2022 17:45:45 +0200 Message-Id: <20220528154546.8261-3-w@1wt.eu> X-Mailer: git-send-email 2.17.5 In-Reply-To: <20220528154546.8261-1-w@1wt.eu> References: <20220528154546.8261-1-w@1wt.eu> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The help in "make -C tools" enumerates nolibc as a valid target so we must at least make it do something. Let's make it do the equivalent of "make headers" in that it will prepare a sysroot with the arch's headers, but will not install the kernel's headers. This is the minimum some tools will need when built with a full-blown toolchain anyway. Signed-off-by: Willy Tarreau --- tools/Makefile | 3 +++ tools/include/nolibc/Makefile | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index c074e42fd92f..e497875fc7e3 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -78,6 +78,9 @@ bpf/%: FORCE libapi: FORCE $(call descend,lib/api) =20 +nolibc: FORCE + $(call descend,include/nolibc) + nolibc_%: FORCE $(call descend,include/nolibc,$(patsubst nolibc_%,%,$@)) =20 diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile index e8bac6ef3653..9768819abd55 100644 --- a/tools/include/nolibc/Makefile +++ b/tools/include/nolibc/Makefile @@ -29,7 +29,7 @@ all_files :=3D ctype.h errno.h nolibc.h signal.h std.h st= dio.h stdlib.h string.h \ sys.h time.h types.h unistd.h =20 # install all headers needed to support a bare-metal compiler -all: +all: headers =20 # Note: when ARCH is "x86" we concatenate both x86_64 and i386 headers: --=20 2.17.5 From nobody Thu May 7 13:10:08 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EDCBC433EF for ; Sat, 28 May 2022 15:46:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244852AbiE1Pql (ORCPT ); Sat, 28 May 2022 11:46:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243709AbiE1Pqi (ORCPT ); Sat, 28 May 2022 11:46:38 -0400 Received: from 1wt.eu (wtarreau.pck.nerim.net [62.212.114.60]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6C06018D for ; Sat, 28 May 2022 08:46:29 -0700 (PDT) Received: (from willy@localhost) by pcw.home.local (8.15.2/8.15.2/Submit) id 24SFjqCt008309; Sat, 28 May 2022 17:45:52 +0200 From: Willy Tarreau To: Linus Torvalds Cc: "Paul E . McKenney" , linux-kernel@vger.kernel.org, Willy Tarreau Subject: [PATCH 3/3] tools/nolibc: add a help target to list supported targets Date: Sat, 28 May 2022 17:45:46 +0200 Message-Id: <20220528154546.8261-4-w@1wt.eu> X-Mailer: git-send-email 2.17.5 In-Reply-To: <20220528154546.8261-1-w@1wt.eu> References: <20220528154546.8261-1-w@1wt.eu> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The "help" target simply presents the list of supported targets and the current set of variables being used to build the sysroot. Since the help in tools/ suggests to use "install", which is supported by most tools while such a target is not really relevant here, an "install" target was also added, redirecting to "help". Signed-off-by: Willy Tarreau --- tools/include/nolibc/Makefile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile index 9768819abd55..cfd06764b5ae 100644 --- a/tools/include/nolibc/Makefile +++ b/tools/include/nolibc/Makefile @@ -31,6 +31,23 @@ all_files :=3D ctype.h errno.h nolibc.h signal.h std.h s= tdio.h stdlib.h string.h \ # install all headers needed to support a bare-metal compiler all: headers =20 +install: help + +help: + @echo "Supported targets under nolibc:" + @echo " all call \"headers\"" + @echo " clean clean the sysroot" + @echo " headers prepare a sysroot in tools/include/nolibc/sy= sroot" + @echo " headers_standalone like \"headers\", and also install kernel he= aders" + @echo " help this help" + @echo "" + @echo "These targets may also be called from tools as \"make nolibc_\"." + @echo "" + @echo "Currently using the following variables:" + @echo " ARCH =3D $(ARCH)" + @echo " OUTPUT =3D $(OUTPUT)" + @echo "" + # Note: when ARCH is "x86" we concatenate both x86_64 and i386 headers: $(Q)mkdir -p $(OUTPUT)sysroot --=20 2.17.5