Re: [RFC PATCH 3/3] tools/nolibc: add a new "install_all_archs" target

["Thomas Weißschuh" <linux@weissschuh.net>]

On 2025-06-20 12:37:05+0200, Willy Tarreau wrote:
> This installs all supported archs together, both from nolibc and kernel
> headers. The arch-specific asm/ subdirs are renamed to asm-arch-$arch,
> and asm/ is rebuilt from all these files in order to include the right
> one depending on the build architecture.
> 
> This allows to use a single unified sysroot for all archs, and to only
> change the compiler or the target architecture. This way, a complete
> sysroot is much easier to use (a single directory is needed) and much
> smaller.
> 
> Signed-off-by: Willy Tarreau <w@1wt.eu>
> ---
>  tools/include/nolibc/Makefile | 39 +++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
> 
> diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
> index 8de6ac5cec425..b6ed11d0b5419 100644
> --- a/tools/include/nolibc/Makefile
> +++ b/tools/include/nolibc/Makefile
> @@ -88,6 +88,7 @@ help:
>  	@echo "  headers_all_archs   prepare a multi-arch sysroot in \$${OUTPUT}sysroot"
>  	@echo "  headers_standalone  like \"headers\", and also install kernel headers"
>  	@echo "  help                this help"
> +	@echo "  install_all_archs   install a multi-arch sysroot + kernel headers in \$${OUTPUT}sysroot"
>  	@echo ""
>  	@echo "These targets may also be called from tools as \"make nolibc_<target>\"."
>  	@echo ""
> @@ -120,6 +121,44 @@ headers_all_archs:
>  	$(Q)cp --parents $(all_files) arch.h "$(OUTPUT)sysroot/include/"
>  	$(Q)cp $(addsuffix .h,$(addprefix arch-,$(nolibc_supported_archs))) "$(OUTPUT)sysroot/include/"
>  
> +install_all_archs: headers_all_archs
> +	@# install common headers for any arch, take them all. This will clear everything.
> +	$(Q)$(MAKE) -C $(srctree) ARCH=x86 mrproper
> +	$(Q)$(MAKE) -C $(srctree) ARCH=x86 headers_install no-export-headers= INSTALL_HDR_PATH="$(OUTPUT)sysroot"
> +	@# remove the contents of the unused asm dir which we will rebuild from the arch ones
> +	$(Q)rm -rf "$(OUTPUT)sysroot/include/asm"
> +	$(Q)mkdir -p "$(OUTPUT)sysroot/include/asm"
> +	@# Now install headers for all archs
> +	$(Q)for arch in $(patsubst aarch64,arm64,$(nolibc_supported_archs)); do \
> +		echo "# installing $$arch"; \
> +		if ! [ -d $(OUTPUT)sysroot/include/asm-arch-$$arch ]; then \
> +			$(MAKE) -C $(srctree) ARCH=$$arch mrproper; \
> +			$(MAKE) -C $(srctree) ARCH=$$arch headers_install no-export-headers= \
> +				INSTALL_HDR_PATH="$(OUTPUT)sysroot/include/$$arch" >/dev/null; \
> +			mv "$(OUTPUT)sysroot/include/$$arch/include/asm" "$(OUTPUT)sysroot/include/asm-arch-$$arch"; \
> +			rm -rf "$(OUTPUT)sysroot/include/$$arch"; \
> +			case "$$arch" in \
> +				arm)       cond="defined(__ARM_EABI__)" ;; \
> +				arm64)     cond="defined(__aarch64__)" ;; \
> +				loongarch) cond="defined(__loongarch__)" ;; \
> +				m68k)      cond="defined(__m68k__)" ;; \
> +				mips)      cond="defined(__mips__)" ;; \
> +				powerpc)   cond="defined(__powerpc__)" ;; \
> +				riscv)     cond="defined(__riscv__)" ;; \
> +				s390)      cond="defined(__s390__) || defined(__s390x__)" ;; \
> +				sparc)     cond="defined(__sparc__)" ;; \
> +				x86)       cond="defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(__x86_64__)";; \
> +				*)         echo "Unsupported arch" >&2; exit 1;; \
> +			esac;\
> +			for file in "$(OUTPUT)sysroot/include/asm-arch-$$arch/"*.h; do \
> +				base="$${file##*/}"; \
> +				( echo "#if $$cond"; \
> +				  echo "#include \"../asm-arch-$$arch/$$base\""; \
> +				  echo "#endif" ) >> "$(OUTPUT)sysroot/include/asm/$$base"; \
> +			done; \

I'm not a fan of the loop to build the ifdeffery. It is a duplication
of what we have in tools/include/nolibc/arch.h and horrible to look at.
Can we stick this into a reusable header file?
Something along the lines of this:

	/* asm/foo.h */
	#define _NOLIBC_PER_ARCH_HEADER "foo.h"
	#include "_nolibc_include_per_arch_header.h"


	/* _nolibc_include_per_arch_header.h */
	#if defined(__i386__)
	#include CONCAT("asm-arch-x86/", _NOLIBC_PER_ARCH_HEADER)
	#elif
	...

However, so far I couldn't get it to work.
Also it would be great if we can use it for the current arch.h, too.

> +		fi;\
> +	done
> +
>  # GCC uses "s390", clang "systemz"
>  CLANG_CROSS_FLAGS := $(subst --target=s390-linux,--target=systemz-linux,$(CLANG_CROSS_FLAGS))
>  
> -- 
> 2.17.5