[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 043/142] meson: convert target/s390x/gen-features.h
From: |
Paolo Bonzini |
Subject: |
[PATCH 043/142] meson: convert target/s390x/gen-features.h |
Date: |
Tue, 28 Jan 2020 18:52:03 +0100 |
From: Marc-André Lureau <address@hidden>
Needed by linux-user/s390x/cpu_loop.c.
Signed-off-by: Marc-André Lureau <address@hidden>
---
Makefile | 2 ++
meson.build | 1 +
target/meson.build | 1 +
target/s390x/Makefile.objs | 20 --------------------
target/s390x/cpu_features.h | 2 +-
target/s390x/cpu_models.h | 2 +-
target/s390x/meson.build | 8 ++++++++
7 files changed, 14 insertions(+), 22 deletions(-)
create mode 100644 target/meson.build
create mode 100644 target/s390x/meson.build
diff --git a/Makefile b/Makefile
index 73d70fcef9..f238cb5461 100644
--- a/Makefile
+++ b/Makefile
@@ -109,6 +109,8 @@ CONFIG_BLOCK := $(call
lor,$(CONFIG_SOFTMMU),$(CONFIG_TOOLS))
generated-files-y = config-host.h
generated-files-y += module_block.h
+generated-files-y += target/s390x/gen-features.h
+target/s390x/gen-features.h: Makefile.ninja
generated-files-y += .git-submodule-status
diff --git a/meson.build b/meson.build
index 23d39363cf..a81e0c4128 100644
--- a/meson.build
+++ b/meson.build
@@ -295,6 +295,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
subdir('io')
subdir('fsdev')
+subdir('target')
# Other build targets
if 'CONFIG_GUEST_AGENT' in config_host
diff --git a/target/meson.build b/target/meson.build
new file mode 100644
index 0000000000..e29dd3e01f
--- /dev/null
+++ b/target/meson.build
@@ -0,0 +1 @@
+subdir('s390x')
diff --git a/target/s390x/Makefile.objs b/target/s390x/Makefile.objs
index 3e2745594a..9b9accc5fd 100644
--- a/target/s390x/Makefile.objs
+++ b/target/s390x/Makefile.objs
@@ -8,23 +8,3 @@ obj-$(CONFIG_SOFTMMU) += sigp.o
obj-$(CONFIG_KVM) += kvm.o
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
obj-$(call lnot,$(CONFIG_TCG)) += tcg-stub.o
-
-# build and run feature list generator
-feat-src = $(SRC_PATH)/target/$(TARGET_BASE_ARCH)/
-feat-dst = $(BUILD_DIR)/$(TARGET_DIR)
-ifneq ($(MAKECMDGOALS),clean)
-generated-files-y += $(feat-dst)gen-features.h
-endif
-
-$(feat-dst)gen-features.h: $(feat-dst)gen-features.h-timestamp
- @cmp $< $@ >/dev/null 2>&1 || cp $< $@
-$(feat-dst)gen-features.h-timestamp: $(feat-dst)gen-features
- $(call quiet-command,$< >$@,"GEN","$(TARGET_DIR)gen-features.h")
-
-$(feat-dst)gen-features: $(feat-src)gen-features.c
- $(call quiet-command,$(HOST_CC) $(QEMU_INCLUDES) -o $@
$<,"CC","$(TARGET_DIR)gen-features")
-
-clean-target:
- rm -f gen-features.h-timestamp
- rm -f gen-features.h
- rm -f gen-features
diff --git a/target/s390x/cpu_features.h b/target/s390x/cpu_features.h
index da695a8346..2a29475493 100644
--- a/target/s390x/cpu_features.h
+++ b/target/s390x/cpu_features.h
@@ -16,7 +16,7 @@
#include "qemu/bitmap.h"
#include "cpu_features_def.h"
-#include "gen-features.h"
+#include "target/s390x/gen-features.h"
/* CPU features are announced via different ways */
typedef enum {
diff --git a/target/s390x/cpu_models.h b/target/s390x/cpu_models.h
index 88bd01a616..74d1f87e4f 100644
--- a/target/s390x/cpu_models.h
+++ b/target/s390x/cpu_models.h
@@ -14,7 +14,7 @@
#define TARGET_S390X_CPU_MODELS_H
#include "cpu_features.h"
-#include "gen-features.h"
+#include "target/s390x/gen-features.h"
#include "hw/core/cpu.h"
/* static CPU definition */
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
new file mode 100644
index 0000000000..980f67cc85
--- /dev/null
+++ b/target/s390x/meson.build
@@ -0,0 +1,8 @@
+gen_features = executable('gen-features', 'gen-features.c', native: true)
+
+gen_features_h = custom_target('gen-features.h',
+ output: 'gen-features.h',
+ capture: true,
+ command: gen_features)
+
+specific_ss.add(gen_features_h)
--
2.21.0
- [PATCH 033/142] meson: generate qemu-version.h, (continued)
- [PATCH 033/142] meson: generate qemu-version.h, Paolo Bonzini, 2020/01/28
- [PATCH 034/142] meson: generate shader headers, Paolo Bonzini, 2020/01/28
- [PATCH 035/142] meson: generate hxtool files, Paolo Bonzini, 2020/01/28
- [PATCH 036/142] meson: configure 50-qemu-gpu.json, Paolo Bonzini, 2020/01/28
- [PATCH 038/142] build-sys hack: link with whole .fa archives, Paolo Bonzini, 2020/01/28
- [PATCH 040/142] meson: convert authz directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 039/142] meson: convert qom directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 041/142] meson: convert crypto directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 037/142] meson: uncompress edk2 bios, Paolo Bonzini, 2020/01/28
- [PATCH 042/142] meson: convert io directory to Meson, Paolo Bonzini, 2020/01/28
- [PATCH 043/142] meson: convert target/s390x/gen-features.h,
Paolo Bonzini <=
- [PATCH 045/142] meson: add macos dependencies, Paolo Bonzini, 2020/01/28
- [PATCH 044/142] meson: infrastructure for building emulators, Paolo Bonzini, 2020/01/28
- [PATCH 046/142] meson: add modules infrastructure, Paolo Bonzini, 2020/01/28
- [PATCH 047/142] meson: convert chardev directory to Meson (tools part), Paolo Bonzini, 2020/01/28
- [PATCH 048/142] meson: convert block, Paolo Bonzini, 2020/01/28
- [PATCH 049/142] meson: qemu-{img,io,nbd}, Paolo Bonzini, 2020/01/28
- [PATCH 052/142] meson: convert chardev directory to Meson (emulator part), Paolo Bonzini, 2020/01/28
- [PATCH 050/142] meson: qemu-pr-helper, Paolo Bonzini, 2020/01/28
- [PATCH 051/142] configure, Makefile; remove TOOLS and HELPERS-y variable, Paolo Bonzini, 2020/01/28
- [PATCH 053/142] meson: convert audio directory to Meson, Paolo Bonzini, 2020/01/28