[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 114/142] meson: linux-user
From: |
Paolo Bonzini |
Subject: |
[PATCH 114/142] meson: linux-user |
Date: |
Tue, 28 Jan 2020 18:53:14 +0100 |
From: Marc-André Lureau <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile.target | 3 ---
linux-user/Makefile.objs | 10 ----------
linux-user/arm/nwfpe/Makefile.objs | 2 --
linux-user/arm/nwfpe/meson.build | 10 ++++++++++
linux-user/meson.build | 22 ++++++++++++++++++++++
meson.build | 9 +++++++++
6 files changed, 41 insertions(+), 15 deletions(-)
delete mode 100644 linux-user/Makefile.objs
delete mode 100644 linux-user/arm/nwfpe/Makefile.objs
create mode 100644 linux-user/arm/nwfpe/meson.build
create mode 100644 linux-user/meson.build
diff --git a/Makefile.target b/Makefile.target
index 3aec144e82..8c3f838ec6 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -130,9 +130,6 @@ QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) \
-I$(SRC_PATH)/linux-user/host/$(ARCH) \
-I$(SRC_PATH)/linux-user
-obj-y += linux-user/
-obj-y += gdbstub.o thunk.o
-
endif #CONFIG_LINUX_USER
#########################################################
diff --git a/linux-user/Makefile.objs b/linux-user/Makefile.objs
deleted file mode 100644
index d2f33beb5e..0000000000
--- a/linux-user/Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
-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 fd-trans.o
-
-obj-$(TARGET_HAS_BFLT) += flatload.o
-obj-$(TARGET_I386) += vm86.o
-obj-$(TARGET_ARM) += arm/nwfpe/
-obj-$(TARGET_ARM) += arm/semihost.o
-obj-$(TARGET_AARCH64) += arm/semihost.o
diff --git a/linux-user/arm/nwfpe/Makefile.objs
b/linux-user/arm/nwfpe/Makefile.objs
deleted file mode 100644
index 51b0c32c2a..0000000000
--- a/linux-user/arm/nwfpe/Makefile.objs
+++ /dev/null
@@ -1,2 +0,0 @@
-obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o
-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o
diff --git a/linux-user/arm/nwfpe/meson.build b/linux-user/arm/nwfpe/meson.build
new file mode 100644
index 0000000000..1c27e55f2a
--- /dev/null
+++ b/linux-user/arm/nwfpe/meson.build
@@ -0,0 +1,10 @@
+linux_user_ss.add(when: 'TARGET_ARM', if_true: files(
+ 'double_cpdo.c',
+ 'extended_cpdo.c',
+ 'fpa11.c',
+ 'fpa11_cpdo.c',
+ 'fpa11_cpdt.c',
+ 'fpa11_cprt.c',
+ 'fpopcode.c',
+ 'single_cpdo.c',
+))
diff --git a/linux-user/meson.build b/linux-user/meson.build
new file mode 100644
index 0000000000..b5711d9b78
--- /dev/null
+++ b/linux-user/meson.build
@@ -0,0 +1,22 @@
+linux_user_ss.add(files(
+ 'elfload.c',
+ 'exit.c',
+ 'fd-trans.c',
+ 'linuxload.c',
+ 'main.c',
+ 'mmap.c',
+ 'safe-syscall.S',
+ 'signal.c',
+ 'strace.c',
+ 'syscall.c',
+ 'uaccess.c',
+ 'uname.c',
+))
+linux_user_ss.add(rt)
+
+linux_user_ss.add(when: 'TARGET_AARCH64', if_true: files('arm/semihost.c'))
+linux_user_ss.add(when: 'TARGET_ARM', if_true: files('arm/semihost.c'))
+linux_user_ss.add(when: 'TARGET_HAS_BFLT', if_true: files('flatload.c'))
+linux_user_ss.add(when: 'TARGET_I386', if_true: files('vm86.c'))
+
+subdir('arm/nwfpe')
diff --git a/meson.build b/meson.build
index bd0067ba5b..07d97d452c 100644
--- a/meson.build
+++ b/meson.build
@@ -655,6 +655,10 @@ subdir('net')
subdir('replay')
subdir('hw')
subdir('accel')
+subdir('linux-user')
+
+linux_user_ss.add(files('gdbstub.c', 'thunk.c'))
+specific_ss.add_all(when: 'CONFIG_LINUX_USER', if_true: linux_user_ss)
mods = []
block_mods = []
@@ -751,6 +755,11 @@ foreach target : target_dirs
base_dir,
base_dir / config_target['TARGET_ABI_DIR'],
)
+ if 'CONFIG_LINUX_USER' in config_target
+ dir = base_dir / config_target['TARGET_ABI_DIR']
+ target_inc += include_directories(base_dir / 'host' /
config_target['ARCH'])
+ arch_srcs += files(dir / 'signal.c', dir / 'cpu_loop.c')
+ endif
endif
t = target_arch[arch].apply(config_target, strict: false)
--
2.21.0
- [PATCH 103/142] meson: convert hw/display, (continued)
- [PATCH 103/142] meson: convert hw/display, Paolo Bonzini, 2020/01/28
- [PATCH 104/142] meson: convert hw/cpu, Paolo Bonzini, 2020/01/28
- [PATCH 105/142] meson: convert hw/char, Paolo Bonzini, 2020/01/28
- [PATCH 106/142] meson: convert hw/block, Paolo Bonzini, 2020/01/28
- [PATCH 107/142] meson: convert hw/audio, Paolo Bonzini, 2020/01/28
- [PATCH 108/142] meson: convert hw/adc, Paolo Bonzini, 2020/01/28
- [PATCH 109/142] meson: convert hw/acpi, Paolo Bonzini, 2020/01/28
- [PATCH 110/142] meson: convert hw/9pfs, Paolo Bonzini, 2020/01/28
- [PATCH 113/142] meson: accel, Paolo Bonzini, 2020/01/28
- [PATCH 111/142] meson: convert hw/arch*, Paolo Bonzini, 2020/01/28
- [PATCH 114/142] meson: linux-user,
Paolo Bonzini <=
- [PATCH 115/142] meson: bsd-user, Paolo Bonzini, 2020/01/28
- [PATCH 112/142] meson: target, Paolo Bonzini, 2020/01/28
- [PATCH 116/142] meson: cpu-emu, Paolo Bonzini, 2020/01/28
- [PATCH 117/142] meson: softmmu, Paolo Bonzini, 2020/01/28
- [PATCH 118/142] meson: plugins, Paolo Bonzini, 2020/01/28
- [PATCH 120/142] meson: generate systemtap tapset files, Paolo Bonzini, 2020/01/28
- [PATCH 121/142] build-sys/rules.mak: remove version.o, Paolo Bonzini, 2020/01/28
- [PATCH 119/142] Aaaaallelujah!, Paolo Bonzini, 2020/01/28