diff options
| author | Peter Maydell | 2018-09-28 12:22:36 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-09-28 12:22:36 +0200 |
| commit | aa8e26de9617756febcbf794dda965df307fdaaa (patch) | |
| tree | c6c20e338e1323c2f374686975b6c2390a1411a6 /linux-user/Makefile.objs | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-09-2... (diff) | |
| parent | linux-user: do setrlimit selectively (diff) | |
| download | qemu-aa8e26de9617756febcbf794dda965df307fdaaa.tar.gz qemu-aa8e26de9617756febcbf794dda965df307fdaaa.tar.xz qemu-aa8e26de9617756febcbf794dda965df307fdaaa.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.1-pull-request' into staging
- some fixes for setrlimit() and write()
- fixes ELF loader when host page size is greater than target page size
- add SO_LINGER to getsockopt()/setsockopt()
- move TargetFdTrans from syscall.c
v2: add "#include <linux/netlink.h>" in linux-user/fd-trans.c
# gpg: Signature made Tue 25 Sep 2018 21:51:13 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-3.1-pull-request:
linux-user: do setrlimit selectively
linux-user: write(fd, NULL, 0) parity with linux's treatment of same
linux-user: elf: mmap all the target-pages of hostpage for data segment
linux-user: add SO_LINGER to {g,s}etsockopt
linux-user: move TargetFdTrans functions to their own file
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/Makefile.objs')
| -rw-r--r-- | linux-user/Makefile.objs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs index b5dfb71f25..769b8d8336 100644 --- a/linux-user/Makefile.objs +++ b/linux-user/Makefile.objs @@ -1,7 +1,7 @@ obj-y = main.o syscall.o strace.o mmap.o signal.o \ elfload.o linuxload.o uaccess.o uname.o \ safe-syscall.o $(TARGET_ABI_DIR)/signal.o \ - $(TARGET_ABI_DIR)/cpu_loop.o exit.o + $(TARGET_ABI_DIR)/cpu_loop.o exit.o fd-trans.o obj-$(TARGET_HAS_BFLT) += flatload.o obj-$(TARGET_I386) += vm86.o |