diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-07-13 21:58:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-07-13 21:58:57 +0100 |
| commit | 2a54fc454cf0dbf173d5dc95205febe381cfb7cc (patch) | |
| tree | dbc4f8497a3784bbabe6b0fd1c2ebcef82280a8a /scripts | |
| parent | c6502434928ae21fb636532aa466daa7244e2c0f (diff) | |
| parent | 2fa4ad3f9000c385f71237984fdd1eefe2a91900 (diff) | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.1-pull-request' into staging
Linux-user pull request 20210713
Update headers to linux v5.13
cleanup errno target headers
Fix race condition on fd translation table
# gpg: Signature made Tue 13 Jul 2021 14:41:25 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-6.1-pull-request:
linux-user: update syscall.tbl to Linux v5.13
linux-user, mips: update syscall-args-o32.c.inc to Linux v5.13
linux-user: update syscall_nr.h to Linux v5.13
fd-trans: Fix race condition on reallocation of the translation table.
linux-user/syscall: Remove ERRNO_TABLE_SIZE check
linux-user: Simplify host <-> target errno conversion using macros
linux-user/mips: Move errno definitions to 'target_errno_defs.h'
linux-user/hppa: Move errno definitions to 'target_errno_defs.h'
linux-user/alpha: Move errno definitions to 'target_errno_defs.h'
linux-user: Extract target errno to 'target_errno_defs.h'
linux-user/sparc: Rename target_errno.h -> target_errno_defs.h
linux-user/syscall: Fix RF-kill errno (typo in ERFKILL)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/update-mips-syscall-args.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/update-mips-syscall-args.sh b/scripts/update-mips-syscall-args.sh index 4f0dda4b83..5a529b699e 100755 --- a/scripts/update-mips-syscall-args.sh +++ b/scripts/update-mips-syscall-args.sh @@ -1,9 +1,9 @@ #!/bin/sh -URL=https://raw.githubusercontent.com/strace/strace/master +URL=https://raw.githubusercontent.com/strace/strace/master/src FILES="sysent.h sysent_shorthand_defs.h linux/mips/syscallent-compat.h \ - linux/mips/syscallent-o32.h linux/syscallent-common-32.h \ - linux/syscallent-common.h" + linux/mips/syscallent-o32.h linux/32/syscallent-common-32.h \ + linux/generic/syscallent-common.h" output="$1" if [ "$output" = "" ] ; then @@ -16,10 +16,11 @@ TMP=$(mktemp -d) cd $TMP for file in $FILES; do - curl -O $URL/$file + curl --create-dirs $URL/$file -o $TMP/$file done -> subcall32.h +> linux/generic/subcallent.h +> linux/32/subcallent.h cat > gen_mips_o32.c <<EOF #include <stdio.h> @@ -52,6 +53,6 @@ int main(void) } EOF -cc -o gen_mips_o32 gen_mips_o32.c && ./gen_mips_o32 > "$output/$INC" +cc -o gen_mips_o32 -I linux/mips -I linux/generic gen_mips_o32.c && ./gen_mips_o32 > "$output/$INC" rm -fr "$TMP" |