OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

meson: convert target/s390x/gen-features.h

Browse Source 
Needed by linux-user/s390x/cpu_loop.c; this removes the only use of HOST_CC.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-08-17 14:55:32 +04:00 committed by Paolo Bonzini
parent 7fcfd45666
commit d3b1848096
8 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -124,6 +124,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

1
configure vendored
View File

@ -7834,7 +7834,6 @@ echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then
echo "IASL=$iasl" >> $config_host_mak
fi
echo "HOST_CC=$host_cc" >> $config_host_mak
echo "CXX=$cxx" >> $config_host_mak
echo "OBJCC=$objcc" >> $config_host_mak
echo "AR=$ar" >> $config_host_mak

1
meson.build
View File

@ -348,6 +348,7 @@ qemuutil = declare_dependency(link_with: libqemuutil,
subdir('io')
subdir('fsdev')
subdir('target')
# Other build targets
if 'CONFIG_GUEST_AGENT' in config_host

1
target/meson.build Normal file
View File

@ -0,0 +1 @@
subdir('s390x')

20
target/s390x/Makefile.objs
View File

@ -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

2
target/s390x/cpu_features.h
View File

@ -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 {

2
target/s390x/cpu_models.h
View File

@ -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 */

9
target/s390x/meson.build Normal file
View File

@ -0,0 +1,9 @@
gen_features = executable('gen-features', 'gen-features.c', native: true,
build_by_default: false)
gen_features_h = custom_target('gen-features.h',
output: 'gen-features.h',
capture: true,
command: gen_features)
specific_ss.add(gen_features_h)