diff options
| author | Marc-André Lureau | 2019-08-18 17:20:37 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2020-08-21 12:30:38 +0200 |
| commit | b309c321256fc48cd7164c55582eaa37bc77b6ab (patch) | |
| tree | eac97671a3a5590d86f988eedcf4e1bf8db35dca | |
| parent | meson: linux-user (diff) | |
| download | qemu-b309c321256fc48cd7164c55582eaa37bc77b6ab.tar.gz qemu-b309c321256fc48cd7164c55582eaa37bc77b6ab.tar.xz qemu-b309c321256fc48cd7164c55582eaa37bc77b6ab.zip | |
meson: bsd-user
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Makefile.target | 3 | ||||
| -rw-r--r-- | bsd-user/Makefile.objs | 2 | ||||
| -rw-r--r-- | bsd-user/meson.build | 10 | ||||
| -rw-r--r-- | meson.build | 4 |
4 files changed, 14 insertions, 5 deletions
diff --git a/Makefile.target b/Makefile.target index a68859d7c2..5c099fa79f 100644 --- a/Makefile.target +++ b/Makefile.target @@ -141,9 +141,6 @@ ifdef CONFIG_BSD_USER QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ABI_DIR) \ -I$(SRC_PATH)/bsd-user/$(HOST_VARIANT_DIR) -obj-y += bsd-user/ -obj-y += gdbstub.o - endif #CONFIG_BSD_USER ######################################################### diff --git a/bsd-user/Makefile.objs b/bsd-user/Makefile.objs deleted file mode 100644 index 5e77f57782..0000000000 --- a/bsd-user/Makefile.objs +++ /dev/null @@ -1,2 +0,0 @@ -obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ - uaccess.o diff --git a/bsd-user/meson.build b/bsd-user/meson.build new file mode 100644 index 0000000000..0369549340 --- /dev/null +++ b/bsd-user/meson.build @@ -0,0 +1,10 @@ +bsd_user_ss.add(files( + 'bsdload.c', + 'elfload.c', + 'main.c', + 'mmap.c', + 'signal.c', + 'strace.c', + 'syscall.c', + 'uaccess.c', +)) diff --git a/meson.build b/meson.build index 490f3d9c75..df63f15ee7 100644 --- a/meson.build +++ b/meson.build @@ -705,8 +705,12 @@ subdir('net') subdir('replay') subdir('hw') subdir('accel') +subdir('bsd-user') subdir('linux-user') +bsd_user_ss.add(files('gdbstub.c')) +specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) + linux_user_ss.add(files('gdbstub.c', 'thunk.c')) specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss) |