Re: [PATCH 1/4] linux-user: update syscall_nr.h to Linux 5.9-rc7

[Alistair Francis]

On Tue, Sep 29, 2020 at 5:34 PM Laurent Vivier <laurent@vivier.eu> wrote:
>
> Update gensyscalls.sh not to generate an empty line at the end of the file
>
> And then automatically update syscall_nr.h running scripts/gensyscalls.sh
>
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>

For the RISC-V part:

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  linux-user/aarch64/syscall_nr.h  | 7 +++++--
>  linux-user/nios2/syscall_nr.h    | 7 +++++--
>  linux-user/openrisc/syscall_nr.h | 8 ++++++--
>  linux-user/riscv/syscall32_nr.h  | 8 +++++++-
>  linux-user/riscv/syscall64_nr.h  | 8 +++++++-
>  scripts/gensyscalls.sh           | 3 +--
>  6 files changed, 31 insertions(+), 10 deletions(-)
>
> diff --git a/linux-user/aarch64/syscall_nr.h b/linux-user/aarch64/syscall_nr.h
> index 85de000b2490..6fd5b331e780 100644
> --- a/linux-user/aarch64/syscall_nr.h
> +++ b/linux-user/aarch64/syscall_nr.h
> @@ -298,7 +298,10 @@
>  #define TARGET_NR_fspick 433
>  #define TARGET_NR_pidfd_open 434
>  #define TARGET_NR_clone3 435
> -#define TARGET_NR_syscalls 436
> +#define TARGET_NR_close_range 436
> +#define TARGET_NR_openat2 437
> +#define TARGET_NR_pidfd_getfd 438
> +#define TARGET_NR_faccessat2 439
> +#define TARGET_NR_syscalls 440
>
>  #endif /* LINUX_USER_AARCH64_SYSCALL_NR_H */
> -
> diff --git a/linux-user/nios2/syscall_nr.h b/linux-user/nios2/syscall_nr.h
> index 32d485dc9ae8..e37f40179bf3 100644
> --- a/linux-user/nios2/syscall_nr.h
> +++ b/linux-user/nios2/syscall_nr.h
> @@ -318,7 +318,10 @@
>  #define TARGET_NR_fsmount 432
>  #define TARGET_NR_fspick 433
>  #define TARGET_NR_pidfd_open 434
> -#define TARGET_NR_syscalls 436
> +#define TARGET_NR_close_range 436
> +#define TARGET_NR_openat2 437
> +#define TARGET_NR_pidfd_getfd 438
> +#define TARGET_NR_faccessat2 439
> +#define TARGET_NR_syscalls 440
>
>  #endif /* LINUX_USER_NIOS2_SYSCALL_NR_H */
> -
> diff --git a/linux-user/openrisc/syscall_nr.h 
> b/linux-user/openrisc/syscall_nr.h
> index 340383beb2c6..a8fc0295109a 100644
> --- a/linux-user/openrisc/syscall_nr.h
> +++ b/linux-user/openrisc/syscall_nr.h
> @@ -318,7 +318,11 @@
>  #define TARGET_NR_fsmount 432
>  #define TARGET_NR_fspick 433
>  #define TARGET_NR_pidfd_open 434
> -#define TARGET_NR_syscalls 436
> +#define TARGET_NR_clone3 435
> +#define TARGET_NR_close_range 436
> +#define TARGET_NR_openat2 437
> +#define TARGET_NR_pidfd_getfd 438
> +#define TARGET_NR_faccessat2 439
> +#define TARGET_NR_syscalls 440
>
>  #endif /* LINUX_USER_OPENRISC_SYSCALL_NR_H */
> -
> diff --git a/linux-user/riscv/syscall32_nr.h b/linux-user/riscv/syscall32_nr.h
> index 4fef73e954da..079b804daef5 100644
> --- a/linux-user/riscv/syscall32_nr.h
> +++ b/linux-user/riscv/syscall32_nr.h
> @@ -1,5 +1,7 @@
>  /*
>   * This file contains the system call numbers.
> + * Do not modify.
> + * This file is generated by scripts/gensyscalls.sh
>   */
>  #ifndef LINUX_USER_RISCV_SYSCALL32_NR_H
>  #define LINUX_USER_RISCV_SYSCALL32_NR_H
> @@ -290,6 +292,10 @@
>  #define TARGET_NR_fspick 433
>  #define TARGET_NR_pidfd_open 434
>  #define TARGET_NR_clone3 435
> -#define TARGET_NR_syscalls 436
> +#define TARGET_NR_close_range 436
> +#define TARGET_NR_openat2 437
> +#define TARGET_NR_pidfd_getfd 438
> +#define TARGET_NR_faccessat2 439
> +#define TARGET_NR_syscalls 440
>
>  #endif /* LINUX_USER_RISCV_SYSCALL32_NR_H */
> diff --git a/linux-user/riscv/syscall64_nr.h b/linux-user/riscv/syscall64_nr.h
> index cc82f3244f55..d54224ccec64 100644
> --- a/linux-user/riscv/syscall64_nr.h
> +++ b/linux-user/riscv/syscall64_nr.h
> @@ -1,5 +1,7 @@
>  /*
>   * This file contains the system call numbers.
> + * Do not modify.
> + * This file is generated by scripts/gensyscalls.sh
>   */
>  #ifndef LINUX_USER_RISCV_SYSCALL64_NR_H
>  #define LINUX_USER_RISCV_SYSCALL64_NR_H
> @@ -296,6 +298,10 @@
>  #define TARGET_NR_fspick 433
>  #define TARGET_NR_pidfd_open 434
>  #define TARGET_NR_clone3 435
> -#define TARGET_NR_syscalls 436
> +#define TARGET_NR_close_range 436
> +#define TARGET_NR_openat2 437
> +#define TARGET_NR_pidfd_getfd 438
> +#define TARGET_NR_faccessat2 439
> +#define TARGET_NR_syscalls 440
>
>  #endif /* LINUX_USER_RISCV_SYSCALL64_NR_H */
> diff --git a/scripts/gensyscalls.sh b/scripts/gensyscalls.sh
> index b7b8456f6312..bba9fb052c47 100755
> --- a/scripts/gensyscalls.sh
> +++ b/scripts/gensyscalls.sh
> @@ -86,8 +86,7 @@ generate_syscall_nr()
>      read_includes $arch $bits | filter_defines | rename_defines | \
>                                  evaluate_values | sort -n -k 3
>      echo
> -    echo "#endif /* ${guard} */"
> -    echo) > "$file"
> +    echo "#endif /* ${guard} */") > "$file"
>  }
>
>  mkdir "$TMP/asm"
> --
> 2.26.2
>
>