[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v8 084/152] meson: convert disas directory to Meson
From: |
Paolo Bonzini |
Subject: |
[PULL v8 084/152] meson: convert disas directory to Meson |
Date: |
Fri, 21 Aug 2020 06:22:21 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 --
disas/Makefile.objs | 30 ------------------------------
disas/libvixl/Makefile.objs | 5 -----
disas/libvixl/meson.build | 7 +++++++
disas/meson.build | 27 +++++++++++++++++++++++++++
meson.build | 1 +
6 files changed, 35 insertions(+), 37 deletions(-)
delete mode 100644 disas/Makefile.objs
delete mode 100644 disas/libvixl/Makefile.objs
create mode 100644 disas/libvixl/meson.build
create mode 100644 disas/meson.build
diff --git a/Makefile.objs b/Makefile.objs
index 7158031c0c..3b32a4c9bb 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -74,8 +74,6 @@ endif # CONFIG_SOFTMMU
# Target-independent parts used in system and user emulation
common-obj-y += hw/
-common-obj-y += qom/
-common-obj-y += disas/
######################################################################
# Resource file for Windows executables
diff --git a/disas/Makefile.objs b/disas/Makefile.objs
deleted file mode 100644
index 3c1cdce026..0000000000
--- a/disas/Makefile.objs
+++ /dev/null
@@ -1,30 +0,0 @@
-
-common-obj-$(CONFIG_ALPHA_DIS) += alpha.o
-common-obj-$(CONFIG_ARM_DIS) += arm.o
-common-obj-$(CONFIG_ARM_A64_DIS) += arm-a64.o
-common-obj-$(CONFIG_ARM_A64_DIS) += libvixl/
-libvixldir = $(SRC_PATH)/disas/libvixl
-# The -Wno-sign-compare is needed only for gcc 4.6, which complains about
-# some signed-unsigned equality comparisons in libvixl which later gcc
-# versions do not.
-arm-a64.o-cflags := -I$(libvixldir) -Wno-sign-compare
-common-obj-$(CONFIG_CRIS_DIS) += cris.o
-common-obj-$(CONFIG_HPPA_DIS) += hppa.o
-common-obj-$(CONFIG_I386_DIS) += i386.o
-common-obj-$(CONFIG_M68K_DIS) += m68k.o
-common-obj-$(CONFIG_MICROBLAZE_DIS) += microblaze.o
-common-obj-$(CONFIG_MIPS_DIS) += mips.o
-common-obj-$(CONFIG_NANOMIPS_DIS) += nanomips.o
-common-obj-$(CONFIG_NIOS2_DIS) += nios2.o
-common-obj-$(CONFIG_MOXIE_DIS) += moxie.o
-common-obj-$(CONFIG_PPC_DIS) += ppc.o
-common-obj-$(CONFIG_RISCV_DIS) += riscv.o
-common-obj-$(CONFIG_S390_DIS) += s390.o
-common-obj-$(CONFIG_SH4_DIS) += sh4.o
-common-obj-$(CONFIG_SPARC_DIS) += sparc.o
-common-obj-$(CONFIG_LM32_DIS) += lm32.o
-common-obj-$(CONFIG_XTENSA_DIS) += xtensa.o
-
-# TODO: As long as the TCG interpreter and its generated code depend
-# on the QEMU target, we cannot compile the disassembler here.
-#common-obj-$(CONFIG_TCI_DIS) += tci.o
diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs
deleted file mode 100644
index 99a637f6a0..0000000000
--- a/disas/libvixl/Makefile.objs
+++ /dev/null
@@ -1,5 +0,0 @@
-common-obj-$(CONFIG_ARM_A64_DIS) = vixl/utils.o \
- vixl/compiler-intrinsics.o \
- vixl/a64/instructions-a64.o \
- vixl/a64/decoder-a64.o \
- vixl/a64/disasm-a64.o
diff --git a/disas/libvixl/meson.build b/disas/libvixl/meson.build
new file mode 100644
index 0000000000..5e2eb33e8e
--- /dev/null
+++ b/disas/libvixl/meson.build
@@ -0,0 +1,7 @@
+libvixl_ss.add(files(
+ 'vixl/a64/decoder-a64.cc',
+ 'vixl/a64/disasm-a64.cc',
+ 'vixl/a64/instructions-a64.cc',
+ 'vixl/compiler-intrinsics.cc',
+ 'vixl/utils.cc',
+))
diff --git a/disas/meson.build b/disas/meson.build
new file mode 100644
index 0000000000..0527d69128
--- /dev/null
+++ b/disas/meson.build
@@ -0,0 +1,27 @@
+libvixl_ss = ss.source_set()
+subdir('libvixl')
+
+common_ss.add(when: 'CONFIG_ALPHA_DIS', if_true: files('alpha.c'))
+common_ss.add(when: 'CONFIG_ARM_A64_DIS', if_true: files('arm-a64.cc'))
+common_ss.add_all(when: 'CONFIG_ARM_A64_DIS', if_true: libvixl_ss)
+common_ss.add(when: 'CONFIG_ARM_DIS', if_true: files('arm.c'))
+common_ss.add(when: 'CONFIG_CRIS_DIS', if_true: files('cris.c'))
+common_ss.add(when: 'CONFIG_HPPA_DIS', if_true: files('hppa.c'))
+common_ss.add(when: 'CONFIG_I386_DIS', if_true: files('i386.c'))
+common_ss.add(when: 'CONFIG_LM32_DIS', if_true: files('lm32.c'))
+common_ss.add(when: 'CONFIG_M68K_DIS', if_true: files('m68k.c'))
+common_ss.add(when: 'CONFIG_MICROBLAZE_DIS', if_true: files('microblaze.c'))
+common_ss.add(when: 'CONFIG_MIPS_DIS', if_true: files('mips.c'))
+common_ss.add(when: 'CONFIG_MOXIE_DIS', if_true: files('moxie.c'))
+common_ss.add(when: 'CONFIG_NANOMIPS_DIS', if_true: files('nanomips.cpp'))
+common_ss.add(when: 'CONFIG_NIOS2_DIS', if_true: files('nios2.c'))
+common_ss.add(when: 'CONFIG_PPC_DIS', if_true: files('ppc.c'))
+common_ss.add(when: 'CONFIG_RISCV_DIS', if_true: files('riscv.c'))
+common_ss.add(when: 'CONFIG_S390_DIS', if_true: files('s390.c'))
+common_ss.add(when: 'CONFIG_SH4_DIS', if_true: files('sh4.c'))
+common_ss.add(when: 'CONFIG_SPARC_DIS', if_true: files('sparc.c'))
+common_ss.add(when: 'CONFIG_XTENSA_DIS', if_true: files('xtensa.c'))
+
+# TODO: As long as the TCG interpreter and its generated code depend
+# on the QEMU target, we cannot compile the disassembler here.
+#common_ss.add(when: 'CONFIG_TCI_DIS', if_true: files('tci.c'))
diff --git a/meson.build b/meson.build
index 06755f34b3..edb635347c 100644
--- a/meson.build
+++ b/meson.build
@@ -673,6 +673,7 @@ common_ss.add(files('cpus-common.c'))
subdir('softmmu')
subdir('backends')
+subdir('disas')
subdir('migration')
subdir('monitor')
subdir('net')
--
2.26.2
- [PULL v8 071/152] meson: convert audio directory to Meson, (continued)
- [PULL v8 071/152] meson: convert audio directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 078/152] meson: convert qemu-storage-daemon, Paolo Bonzini, 2020/08/21
- [PULL v8 079/152] meson: convert replay directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 080/152] meson: convert migration directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 070/152] meson: convert tests/qtest to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 082/152] meson: convert backends directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 081/152] meson: convert net directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 077/152] meson: convert common QMP bits for qemu and qemu-storage-daemon, Paolo Bonzini, 2020/08/21
- [PULL v8 072/152] meson: convert ui directory to Meson, Paolo Bonzini, 2020/08/21
- [PULL v8 085/152] meson: convert qapi-specific to meson, Paolo Bonzini, 2020/08/21
- [PULL v8 084/152] meson: convert disas directory to Meson,
Paolo Bonzini <=
- [PULL v8 089/152] meson: convert hw/nubus, Paolo Bonzini, 2020/08/21
- [PULL v8 087/152] meson: convert hw/core, Paolo Bonzini, 2020/08/21
- [PULL v8 083/152] meson: convert fsdev/, Paolo Bonzini, 2020/08/21
- [PULL v8 086/152] meson: convert hw/xen, Paolo Bonzini, 2020/08/21
- [PULL v8 090/152] meson: convert hw/smbios, Paolo Bonzini, 2020/08/21
- [PULL v8 091/152] meson: convert hw/mem, Paolo Bonzini, 2020/08/21
- [PULL v8 093/152] meson: convert hw/virtio, Paolo Bonzini, 2020/08/21
- [PULL v8 096/152] meson: convert hw/tpm, Paolo Bonzini, 2020/08/21
- [PULL v8 098/152] meson: convert hw/rtc, Paolo Bonzini, 2020/08/21
- [PULL v8 094/152] meson: convert hw/vfio, Paolo Bonzini, 2020/08/21