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

Merge tag 'nolibc-20250724-for-6.17-1' of... 

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

Pull nolibc updates from Thomas Weißschuh:
 "Highlights:
   - New supported architectures: SuperH, x32, MIPS n32/n64
   - Adopt general kernel architectures names
   - Integrate the nolibc selftests into the kselftests framework
   - Various fixes and new syscall wrappers

  Two non-nolibc changes:
   - New arm64 selftest which depends on nolibc changes
   - General tools/ cross-compilation bugfix for s390 clang"

* tag 'nolibc-20250724-for-6.17-1' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc: (30 commits)
  selftests/nolibc: add x32 test configuration
  tools/nolibc: define time_t in terms of __kernel_old_time_t
  selftests/nolibc: show failed run if test process crashes
  tools/nolibc: drop s390 clang target override
  tools/build: Fix s390(x) cross-compilation with clang
  tools/nolibc: avoid false-positive -Wmaybe-uninitialized through waitpid()
  selftests/nolibc: correctly report errors from printf() and friends
  selftests/nolibc: create /dev/full when running as PID 1
  tools/nolibc: add support for clock_nanosleep() and nanosleep()
  kselftest/arm64: Add a test for vfork() with GCS
  selftests/nolibc: Add coverage of vfork()
  tools/nolibc: Provide vfork()
  tools/nolibc: Replace ifdef with if defined() in sys.h
  tools/nolibc: add support for SuperH
  selftests/nolibc: use file driver for QEMU serial
  selftests/nolibc: fix EXTRACONFIG variables ordering
  tools/nolibc: MIPS: add support for N64 and N32 ABIs
  tools/nolibc: MIPS: drop noreorder option
  tools/nolibc: MIPS: drop manual stack pointer alignment
  tools/nolibc: MIPS: drop $gp setup
  ...
parents 78bb43e5 b9e50363

tools/include/nolibc/Makefile

+4 −14
Original line number Diff line number Diff line
@@ -23,8 +23,7 @@ else 
Q=@

endif



nolibc_arch := $(patsubst arm64,aarch64,$(ARCH))

arch_file := arch-$(nolibc_arch).h

arch_file := arch-$(ARCH).h

all_files := \

		compiler.h \

		crt.h \
@@ -91,18 +90,12 @@ help: 
	@echo "  OUTPUT  = $(OUTPUT)"

	@echo ""



# Note: when ARCH is "x86" we concatenate both x86_64 and i386

headers:

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

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

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

	$(Q)if [ "$(ARCH)" = "x86" ]; then      \

		sed -e                          \

		  's,^#ifndef _NOLIBC_ARCH_X86_64_H,#if !defined(_NOLIBC_ARCH_X86_64_H) \&\& defined(__x86_64__),' \

		  arch-x86_64.h;                \

		sed -e                          \

		  's,^#ifndef _NOLIBC_ARCH_I386_H,#if !defined(_NOLIBC_ARCH_I386_H) \&\& !defined(__x86_64__),' \

		  arch-i386.h;                  \

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

		cat arch-x86.h;                 \

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

		cat $(arch_file);               \

	else                                    \
@@ -114,11 +107,8 @@ headers_standalone: headers 
	$(Q)$(MAKE) -C $(srctree) headers

	$(Q)$(MAKE) -C $(srctree) headers_install INSTALL_HDR_PATH=$(OUTPUT)sysroot



# GCC uses "s390", clang "systemz"

CLANG_CROSS_FLAGS := $(subst --target=s390-linux,--target=systemz-linux,$(CLANG_CROSS_FLAGS))



headers_check: headers_standalone

	for header in $(filter-out crt.h std.h,$(all_files)); do \

	$(Q)for header in $(filter-out crt.h std.h,$(all_files)); do \

		$(CC) $(CLANG_CROSS_FLAGS) -Wall -Werror -nostdinc -fsyntax-only -x c /dev/null \

			-I$(or $(objtree),$(srctree))/usr/include -include $$header -include $$header || exit 1; \

	done

tools/include/nolibc/arch-aarch64.h→tools/include/nolibc/arch-arm64.h

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */

/*

 * AARCH64 specific definitions for NOLIBC

 * ARM64 specific definitions for NOLIBC

 * Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>

 */



#ifndef _NOLIBC_ARCH_AARCH64_H

#define _NOLIBC_ARCH_AARCH64_H

#ifndef _NOLIBC_ARCH_ARM64_H

#define _NOLIBC_ARCH_ARM64_H



#include "compiler.h"

#include "crt.h"



/* Syscalls for AARCH64 :

/* Syscalls for ARM64 :

 *   - registers are 64-bit

 *   - stack is 16-byte aligned

 *   - syscall number is passed in x8
@@ -150,4 +150,4 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s 
	);

	__nolibc_entrypoint_epilogue();

}

#endif /* _NOLIBC_ARCH_AARCH64_H */
 
#endif /* _NOLIBC_ARCH_ARM64_H */

tools/include/nolibc/arch-mips.h

+90 −27
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "compiler.h"

#include "crt.h"



#if !defined(_ABIO32)

#if !defined(_ABIO32) && !defined(_ABIN32) && !defined(_ABI64)

#error Unsupported MIPS ABI

#endif
@@ -32,11 +32,32 @@ 
 *   - the arguments are cast to long and assigned into the target registers

 *     which are then simply passed as registers to the asm code, so that we

 *     don't have to experience issues with register constraints.

 *

 * Syscalls for MIPS ABI N32, same as ABI O32 with the following differences :

 *   - arguments are in a0, a1, a2, a3, t0, t1, t2, t3.

 *     t0..t3 are also known as a4..a7.

 *   - stack is 16-byte aligned

 */



#if defined(_ABIO32)



#define _NOLIBC_SYSCALL_CLOBBERLIST \

	"memory", "cc", "at", "v1", "hi", "lo", \

	"t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7", "t8", "t9"

#define _NOLIBC_SYSCALL_STACK_RESERVE "addiu $sp, $sp, -32\n"

#define _NOLIBC_SYSCALL_STACK_UNRESERVE "addiu $sp, $sp, 32\n"



#else /* _ABIN32 || _ABI64 */



/* binutils, GCC and clang disagree about register aliases, use numbers instead. */

#define _NOLIBC_SYSCALL_CLOBBERLIST \

	"memory", "cc", "at", "v1", \

	"10", "11", "12", "13", "14", "15", "24", "25"



#define _NOLIBC_SYSCALL_STACK_RESERVE

#define _NOLIBC_SYSCALL_STACK_UNRESERVE



#endif /* _ABIO32 */



#define my_syscall0(num)                                                      \

({                                                                            \
@@ -44,9 +65,9 @@ 
	register long _arg4 __asm__ ("a3");                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r"(_num), "=r"(_arg4)                                     \

		: "r"(_num)                                                   \

		: _NOLIBC_SYSCALL_CLOBBERLIST                                 \
@@ -61,9 +82,9 @@ 
	register long _arg4 __asm__ ("a3");                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r"(_num), "=r"(_arg4)                                     \

		: "0"(_num),                                                  \

		  "r"(_arg1)                                                  \
@@ -80,9 +101,9 @@ 
	register long _arg4 __asm__ ("a3");                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r"(_num), "=r"(_arg4)                                     \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2)                                      \
@@ -100,9 +121,9 @@ 
	register long _arg4 __asm__ ("a3");                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r"(_num), "=r"(_arg4)                                     \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3)                          \
@@ -120,9 +141,9 @@ 
	register long _arg4 __asm__ ("a3") = (long)(arg4);                    \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r" (_num), "=r"(_arg4)                                    \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4)              \
@@ -131,6 +152,8 @@ 
	_arg4 ? -_num : _num;                                                 \

})



#if defined(_ABIO32)



#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5)                        \

({                                                                            \

	register long _num __asm__ ("v0") = (num);                            \
@@ -141,10 +164,10 @@ 
	register long _arg5 = (long)(arg5);                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"sw %7, 16($sp)\n"                                            \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r" (_num), "=r"(_arg4)                                    \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5)  \
@@ -164,11 +187,53 @@ 
	register long _arg6 = (long)(arg6);                                   \

									      \

	__asm__ volatile (                                                    \

		"addiu $sp, $sp, -32\n"                                       \

		_NOLIBC_SYSCALL_STACK_RESERVE                                 \

		"sw %7, 16($sp)\n"                                            \

		"sw %8, 20($sp)\n"                                            \

		"syscall\n"                                                   \

		"addiu $sp, $sp, 32\n"                                        \

		_NOLIBC_SYSCALL_STACK_UNRESERVE                               \

		: "=r" (_num), "=r"(_arg4)                                    \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \

		  "r"(_arg6)                                                  \

		: _NOLIBC_SYSCALL_CLOBBERLIST                                 \

	);                                                                    \

	_arg4 ? -_num : _num;                                                 \

})



#else /* _ABIN32 || _ABI64 */



#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5)                        \

({                                                                            \

	register long _num __asm__ ("v0") = (num);                            \

	register long _arg1 __asm__ ("$4") = (long)(arg1);                    \

	register long _arg2 __asm__ ("$5") = (long)(arg2);                    \

	register long _arg3 __asm__ ("$6") = (long)(arg3);                    \

	register long _arg4 __asm__ ("$7") = (long)(arg4);                    \

	register long _arg5 __asm__ ("$8") = (long)(arg5);                    \

									      \

	__asm__ volatile (                                                    \

		"syscall\n"                                                   \

		: "=r" (_num), "=r"(_arg4)                                    \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5)  \

		: _NOLIBC_SYSCALL_CLOBBERLIST                                 \

	);                                                                    \

	_arg4 ? -_num : _num;                                                 \

})



#define my_syscall6(num, arg1, arg2, arg3, arg4, arg5, arg6)                  \

({                                                                            \

	register long _num __asm__ ("v0")  = (num);                           \

	register long _arg1 __asm__ ("$4") = (long)(arg1);                    \

	register long _arg2 __asm__ ("$5") = (long)(arg2);                    \

	register long _arg3 __asm__ ("$6") = (long)(arg3);                    \

	register long _arg4 __asm__ ("$7") = (long)(arg4);                    \

	register long _arg5 __asm__ ("$8") = (long)(arg5);                    \

	register long _arg6 __asm__ ("$9") = (long)(arg6);                    \

									      \

	__asm__ volatile (                                                    \

		"syscall\n"                                                   \

		: "=r" (_num), "=r"(_arg4)                                    \

		: "0"(_num),                                                  \

		  "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \
@@ -178,28 +243,26 @@ 
	_arg4 ? -_num : _num;                                                 \

})



#endif /* _ABIO32 */



/* startup code, note that it's called __start on MIPS */

void __start(void);

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

{

	__asm__ volatile (

		".set push\n"

		".set noreorder\n"

		"bal 1f\n"               /* prime $ra for .cpload                            */

		"nop\n"

		"1:\n"

		".cpload $ra\n"

		"move  $a0, $sp\n"       /* save stack pointer to $a0, as arg1 of _start_c */

		"addiu $sp, $sp, -4\n"   /* space for .cprestore to store $gp              */

		".cprestore 0\n"

		"li    $t0, -8\n"

		"and   $sp, $sp, $t0\n"  /* $sp must be 8-byte aligned                     */

#if defined(_ABIO32)

		"addiu $sp, $sp, -16\n"  /* the callee expects to save a0..a3 there        */

#endif /* _ABIO32 */

		"lui $t9, %hi(_start_c)\n" /* ABI requires current function address in $t9 */

		"ori $t9, %lo(_start_c)\n"

#if defined(_ABI64)

		"lui  $t0, %highest(_start_c)\n"

		"ori  $t0, %higher(_start_c)\n"

		"dsll $t0, 0x20\n"

		"or   $t9, $t0\n"

#endif /* _ABI64 */

		"jalr $t9\n"             /* transfer to c runtime                          */

		" nop\n"                 /* delayed slot                                   */

		".set pop\n"

	);

	__nolibc_entrypoint_epilogue();

}

tools/include/nolibc/arch-i386.h→tools/include/nolibc/arch-sh.h

+162 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

tools/include/nolibc/arch-sparc.h

+16 −0
Original line number Diff line number Diff line
@@ -188,4 +188,20 @@ pid_t sys_fork(void) 
}

#define sys_fork sys_fork



static __attribute__((unused))

pid_t sys_vfork(void)

{

	pid_t parent, ret;



	parent = getpid();

	ret = my_syscall0(__NR_vfork);



	/* The syscall returns the parent pid in the child instead of 0 */

	if (ret == parent)

		return 0;

	else

		return ret;

}

#define sys_vfork sys_vfork



#endif /* _NOLIBC_ARCH_SPARC_H */