Commit f2310b62 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nolibc-20251130-for-6.19-1' of... 

Merge tag 'nolibc-20251130-for-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc

Pull nolibc updates from Thomas Weißschuh:

 - Preparations to the use of nolibc in UML:
     - Cleanup of sparse warnings
     - Library mode without _start()
     - More consistency when disabling errno

 - Unconditional installation of all architecture support files

 - Always 64-bit wide ino_t and off_t

 - Various cleanups and bug fixes

* tag 'nolibc-20251130-for-6.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc: (25 commits)
  selftests/nolibc: error out on linker warnings
  selftests/nolibc: use lld to link loongarch binaries
  tools/nolibc: remove more __nolibc_enosys() fallbacks
  tools/nolibc: remove now superfluous overflow check in llseek
  tools/nolibc: use 64-bit off_t
  tools/nolibc: prefer the llseek syscall
  tools/nolibc: handle 64-bit off_t for llseek
  tools/nolibc: use 64-bit ino_t
  tools/nolibc: avoid using plain integer as NULL pointer
  tools/nolibc: add support for fchdir()
  tools/nolibc: clean up outdated comments in generic arch.h
  tools/nolibc: make the "headers" target install all supported archs
  tools/nolibc: add the more portable inttypes.h
  tools/nolibc: provide the portable sys/select.h
  tools/nolibc: add missing memchr() to string.h
  tools/nolibc: fix misleading help message regarding installation path
  tools/nolibc: add uio.h with readv and writev
  tools/nolibc: add option to disable runtime
  tools/nolibc: use __fallthrough__ rather than fallthrough
  tools/nolibc: implement %m if errno is not defined
  ...
parents 82d7a9da 1d573464

tools/include/nolibc/Makefile

+9 −13
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ else 
Q=@

endif



arch_file := arch-$(ARCH).h

arch_files := arch.h $(wildcard arch-*.h)

all_files := \

		compiler.h \

		crt.h \
@@ -33,6 +33,7 @@ all_files := \ 
		errno.h \

		fcntl.h \

		getopt.h \

		inttypes.h \

		limits.h \

		math.h \

		nolibc.h \
@@ -56,12 +57,14 @@ all_files := \ 
		sys/random.h \

		sys/reboot.h \

		sys/resource.h \

		sys/select.h \

		sys/stat.h \

		sys/syscall.h \

		sys/sysmacros.h \

		sys/time.h \

		sys/timerfd.h \

		sys/types.h \

		sys/uio.h \

		sys/utsname.h \

		sys/wait.h \

		time.h \
@@ -79,7 +82,7 @@ help: 
	@echo "Supported targets under nolibc:"

	@echo "  all                 call \"headers\""

	@echo "  clean               clean the sysroot"

	@echo "  headers             prepare a sysroot in tools/include/nolibc/sysroot"

	@echo "  headers             prepare a multi-arch sysroot in \$${OUTPUT}sysroot"

	@echo "  headers_standalone  like \"headers\", and also install kernel headers"

	@echo "  help                this help"

	@echo ""
@@ -90,18 +93,11 @@ help: 
	@echo "  OUTPUT  = $(OUTPUT)"

	@echo ""



# installs headers for all archs at once.

headers:

	$(Q)mkdir -p $(OUTPUT)sysroot

	$(Q)mkdir -p $(OUTPUT)sysroot/include

	$(Q)cp --parents $(all_files) $(OUTPUT)sysroot/include/

	$(Q)if [ "$(ARCH)" = "i386" -o "$(ARCH)" = "x86_64" ]; then \

		cat arch-x86.h;                 \

	elif [ -e "$(arch_file)" ]; then        \

		cat $(arch_file);               \

	else                                    \

		echo "Fatal: architecture $(ARCH) not yet supported by nolibc." >&2; \

		exit 1;                         \

	fi > $(OUTPUT)sysroot/include/arch.h

	$(Q)mkdir -p "$(OUTPUT)sysroot"

	$(Q)mkdir -p "$(OUTPUT)sysroot/include"

	$(Q)cp --parents $(arch_files) $(all_files) "$(OUTPUT)sysroot/include/"



headers_standalone: headers

	$(Q)$(MAKE) -C $(srctree) headers

tools/include/nolibc/arch-arm.h

+2 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
	_arg1;                                                                \

})



#ifndef NOLIBC_NO_RUNTIME

/* startup code */

void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)

{
@@ -193,5 +194,6 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s 
	);

	__nolibc_entrypoint_epilogue();

}

#endif /* NOLIBC_NO_RUNTIME */



#endif /* _NOLIBC_ARCH_ARM_H */

tools/include/nolibc/arch-arm64.h

+2 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 
	_arg1;                                                                \

})



#ifndef NOLIBC_NO_RUNTIME

/* startup code */

void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)

{
@@ -150,4 +151,5 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s 
	);

	__nolibc_entrypoint_epilogue();

}

#endif /* NOLIBC_NO_RUNTIME */

#endif /* _NOLIBC_ARCH_ARM64_H */

tools/include/nolibc/arch-loongarch.h

+2 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ 
	_arg1;                                                                \

})



#ifndef NOLIBC_NO_RUNTIME

/* startup code */

void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)

{
@@ -151,5 +152,6 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s 
	);

	__nolibc_entrypoint_epilogue();

}

#endif /* NOLIBC_NO_RUNTIME */



#endif /* _NOLIBC_ARCH_LOONGARCH_H */

tools/include/nolibc/arch-m68k.h

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
	_num;                                                                 \

})



#ifndef NOLIBC_NO_RUNTIME

void _start(void);

void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _start(void)

{
@@ -137,5 +138,6 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s 
	);

	__nolibc_entrypoint_epilogue();

}

#endif /* NOLIBC_NO_RUNTIME */



#endif /* _NOLIBC_ARCH_M68K_H */