]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/nolibc: drop NOLIBC_SYSROOT=0 logic
authorThomas Weißschuh <linux@weissschuh.net>
Sun, 4 Jan 2026 14:57:51 +0000 (15:57 +0100)
committerThomas Weißschuh <linux@weissschuh.net>
Tue, 6 Jan 2026 11:08:09 +0000 (12:08 +0100)
This logic was added in commit 850fad7de827 ("selftests/nolibc: allow
test -include /path/to/nolibc.h") to allow the testing of -include
/path/to/nolibc.h. As it requires as special variable to activate, this
code is nearly never used. Furthermore it complicates the logic a bit.

Since commit a6a054c8ad32 ("tools/nolibc: add target to check header
usability") and commit 443c6467fcd6 ("selftests/nolibc: always run
nolibc header check") the usability of -include /path/to/nolibc.h is
always checked anyways, making NOLIBC_SYSROOT=0 pointless.

Drop the special logic.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://patch.msgid.link/20260104-nolibc-nolibc_sysroot-v1-1-98025ad99add@weissschuh.net
tools/testing/selftests/nolibc/Makefile.nolibc

index f9d43cbdc894665514d95450aed6cc5903224963..b17ba2f8fb4670533d7bb005cf9b342338b98907 100644 (file)
@@ -302,15 +302,9 @@ sysroot/$(ARCH)/include:
        $(Q)$(MAKE) -C $(srctree)/tools/include/nolibc ARCH=$(ARCH) OUTPUT=$(CURDIR)/sysroot/ headers_standalone headers_check
        $(Q)mv sysroot/sysroot sysroot/$(ARCH)
 
-ifneq ($(NOLIBC_SYSROOT),0)
 nolibc-test: nolibc-test.c nolibc-test-linkage.c sysroot/$(ARCH)/include
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
          -nostdlib -nostdinc -static -Isysroot/$(ARCH)/include nolibc-test.c nolibc-test-linkage.c $(LIBGCC)
-else
-nolibc-test: nolibc-test.c nolibc-test-linkage.c
-       $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ \
-         -nostdlib -static -include $(srctree)/tools/include/nolibc/nolibc.h nolibc-test.c nolibc-test-linkage.c $(LIBGCC)
-endif
 
 libc-test: nolibc-test.c nolibc-test-linkage.c
        $(QUIET_CC)$(HOSTCC) -o $@ nolibc-test.c nolibc-test-linkage.c