diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 13:04:33 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-02-15 13:04:33 +0000 |
| commit | 3ea856094cb77fe3087f607fa75382073963254b (patch) | |
| tree | b3797f7ef4d122eb27952ab8c7c0e911c5134b4f /linux-user/mips/sockbits.h | |
| parent | 0280396a33c7210c4df5306afeab63411a41535a (diff) | |
| parent | b8f91fd49c5c6993e06f0cd7bf024d176051320e (diff) | |
| download | focaccia-qemu-3ea856094cb77fe3087f607fa75382073963254b.tar.gz focaccia-qemu-3ea856094cb77fe3087f607fa75382073963254b.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-6.0-pull-request' into staging
Pull request
# gpg: Signature made Mon 15 Feb 2021 12:51:38 GMT
# 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.0-pull-request:
linux-user/mips: Support the n32 ABI for the R5900
docs/user: Remove outdated 'Quick Start' section
linux-user: target: signal: Support TARGET_SS_AUTODISARM
linux-user: add TARGET_SO_{DOMAIN,PROTOCOL}
linux-user/syscall: Fix do_ioctl_ifconf() for 64 bit targets.
linux-user/mmap: Avoid asserts for out of range mremap calls
linux-user: Fix loading of BSS segments
linux-user: fix O_NONBLOCK in signalfd4() and eventfd2() syscalls
linux-user: fix O_NONBLOCK usage for hppa target
linux-user: Add missing TARGET___O_TMPFILE for hppa and alpha
linux-user/signal: Decode waitid si_code
linux-user/mips64: Support o32 ABI syscalls
linux-user/mips64: Restore setup_frame() for o32 ABI
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/mips/sockbits.h')
| -rw-r--r-- | linux-user/mips/sockbits.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-user/mips/sockbits.h b/linux-user/mips/sockbits.h index 0f022cd598..562cad88e2 100644 --- a/linux-user/mips/sockbits.h +++ b/linux-user/mips/sockbits.h @@ -40,6 +40,8 @@ #define TARGET_SO_SNDTIMEO 0x1005 /* send timeout */ #define TARGET_SO_RCVTIMEO 0x1006 /* receive timeout */ #define TARGET_SO_ACCEPTCONN 0x1009 +#define TARGET_SO_PROTOCOL 0x1028 /* protocol type */ +#define TARGET_SO_DOMAIN 0x1029 /* domain/socket family */ /* linux-specific, might as well be the same as on i386 */ #define TARGET_SO_NO_CHECK 11 |