build: move libobj-y variable to nested Makefile.objs
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
5e8861a036
commit
9cdc8df314
|
@ -76,41 +76,19 @@ all: $(PROGS) stap
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# cpu emulator library
|
# cpu emulator library
|
||||||
libobj-y = exec.o translate-all.o cpu-exec.o translate.o
|
obj-y = exec.o translate-all.o cpu-exec.o translate.o
|
||||||
libobj-y += tcg/tcg.o tcg/optimize.o
|
obj-y += tcg/tcg.o tcg/optimize.o
|
||||||
libobj-$(CONFIG_TCG_INTERPRETER) += tci.o
|
obj-$(CONFIG_TCG_INTERPRETER) += tci.o
|
||||||
libobj-y += fpu/softfloat.o
|
obj-y += fpu/softfloat.o
|
||||||
ifneq ($(TARGET_BASE_ARCH), sparc)
|
obj-y += disas.o
|
||||||
ifneq ($(TARGET_BASE_ARCH), alpha)
|
obj-$(CONFIG_TCI_DIS) += tci-dis.o
|
||||||
libobj-y += op_helper.o
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
libobj-y += helper.o
|
|
||||||
ifneq ($(TARGET_BASE_ARCH), ppc)
|
|
||||||
libobj-y += cpu.o
|
|
||||||
endif
|
|
||||||
libobj-$(TARGET_SPARC64) += vis_helper.o
|
|
||||||
libobj-$(CONFIG_NEED_MMU) += mmu.o
|
|
||||||
libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
|
|
||||||
ifeq ($(TARGET_BASE_ARCH), sparc)
|
|
||||||
libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
|
||||||
endif
|
|
||||||
libobj-$(TARGET_SPARC) += int32_helper.o
|
|
||||||
libobj-$(TARGET_SPARC64) += int64_helper.o
|
|
||||||
libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
|
|
||||||
|
|
||||||
libobj-y += disas.o
|
|
||||||
libobj-$(CONFIG_TCI_DIS) += tci-dis.o
|
|
||||||
|
|
||||||
obj-y += target-$(TARGET_BASE_ARCH)/
|
obj-y += target-$(TARGET_BASE_ARCH)/
|
||||||
|
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
|
||||||
|
|
||||||
tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
|
tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
|
||||||
|
|
||||||
# HELPER_CFLAGS is used for all the legacy code compiled with static register
|
# HELPER_CFLAGS is used for all the legacy code compiled with static register
|
||||||
# variables
|
# variables
|
||||||
ifneq ($(TARGET_BASE_ARCH), sparc)
|
|
||||||
op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
|
||||||
endif
|
|
||||||
user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
||||||
# Note: this is a workaround. The real fix is to avoid compiling
|
# Note: this is a workaround. The real fix is to avoid compiling
|
||||||
|
@ -130,7 +108,6 @@ obj-y += gdbstub.o thunk.o user-exec.o $(oslib-obj-y)
|
||||||
obj-y += $(addprefix ../, $(universal-obj-y))
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
||||||
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
||||||
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
||||||
obj-y += $(libobj-y)
|
|
||||||
|
|
||||||
endif #CONFIG_LINUX_USER
|
endif #CONFIG_LINUX_USER
|
||||||
|
|
||||||
|
@ -147,7 +124,6 @@ obj-y += gdbstub.o user-exec.o
|
||||||
obj-y += $(addprefix ../, $(universal-obj-y))
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
||||||
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
obj-y += $(addprefix ../libuser/, $(user-obj-y))
|
||||||
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
|
||||||
obj-y += $(libobj-y)
|
|
||||||
|
|
||||||
endif #CONFIG_BSD_USER
|
endif #CONFIG_BSD_USER
|
||||||
|
|
||||||
|
@ -215,7 +191,6 @@ GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h
|
||||||
obj-y += $(addprefix ../, $(universal-obj-y))
|
obj-y += $(addprefix ../, $(universal-obj-y))
|
||||||
obj-y += $(addprefix ../, $(common-obj-y))
|
obj-y += $(addprefix ../, $(common-obj-y))
|
||||||
obj-y += $(addprefix ../libdis/, $(libdis-y))
|
obj-y += $(addprefix ../libdis/, $(libdis-y))
|
||||||
obj-y += $(libobj-y)
|
|
||||||
obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
|
obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
|
||||||
obj-y += $(addprefix ../, $(trace-obj-y))
|
obj-y += $(addprefix ../, $(trace-obj-y))
|
||||||
|
|
||||||
|
@ -231,8 +206,6 @@ obj-$(CONFIG_SMARTCARD_NSS) += $(addprefix ../libcacard/, $(libcacard-y))
|
||||||
endif # CONFIG_BSD_USER
|
endif # CONFIG_BSD_USER
|
||||||
endif # CONFIG_LINUX_USER
|
endif # CONFIG_LINUX_USER
|
||||||
|
|
||||||
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
|
|
||||||
|
|
||||||
nested-vars = obj-y
|
nested-vars = obj-y
|
||||||
dummy := $(call unnest-vars)
|
dummy := $(call unnest-vars)
|
||||||
|
|
||||||
|
|
|
@ -3911,12 +3911,6 @@ if test "$target_softmmu" = "yes" ; then
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$target_softmmu" = "yes" -a \( \
|
|
||||||
"$TARGET_ARCH" = "microblaze" -o \
|
|
||||||
"$TARGET_ARCH" = "cris" \) ; then
|
|
||||||
echo "CONFIG_NEED_MMU=y" >> $config_target_mak
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$gprof" = "yes" ; then
|
if test "$gprof" = "yes" ; then
|
||||||
echo "TARGET_GPROF=yes" >> $config_target_mak
|
echo "TARGET_GPROF=yes" >> $config_target_mak
|
||||||
if test "$target_linux_user" = "yes" ; then
|
if test "$target_linux_user" = "yes" ; then
|
||||||
|
|
|
@ -1 +1,2 @@
|
||||||
# still empty
|
obj-y += helper.o cpu.o
|
||||||
|
obj-y += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
|
||||||
|
|
|
@ -1 +1,5 @@
|
||||||
obj-y += arm-semi.o
|
obj-y += arm-semi.o
|
||||||
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
obj-y += neon_helper.o iwmmxt_helper.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,4 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
obj-$(CONFIG_SOFTMMU) += mmu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
obj-$(CONFIG_KVM) += hyperv.o
|
obj-$(CONFIG_KVM) += hyperv.o
|
||||||
obj-$(CONFIG_LINUX_USER) += ioport-user.o
|
obj-$(CONFIG_LINUX_USER) += ioport-user.o
|
||||||
obj-$(CONFIG_BSD_USER) += ioport-user.o
|
obj-$(CONFIG_BSD_USER) += ioport-user.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,4 @@
|
||||||
obj-y += m68k-semi.o
|
obj-y += m68k-semi.o
|
||||||
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,4 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
obj-$(CONFIG_SOFTMMU) += mmu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,7 @@
|
||||||
# still empty
|
obj-y += helper.o cpu.o
|
||||||
|
obj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
|
||||||
|
obj-$(TARGET_SPARC) += int32_helper.o
|
||||||
|
obj-$(TARGET_SPARC64) += int64_helper.o
|
||||||
|
obj-$(TARGET_SPARC64) += vis_helper.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -1 +1,3 @@
|
||||||
# still empty
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
|
@ -2,3 +2,6 @@ obj-y += xtensa-semi.o
|
||||||
obj-y += core-dc232b.o
|
obj-y += core-dc232b.o
|
||||||
obj-y += core-dc233c.o
|
obj-y += core-dc233c.o
|
||||||
obj-y += core-fsf.o
|
obj-y += core-fsf.o
|
||||||
|
obj-y += op_helper.o helper.o cpu.o
|
||||||
|
|
||||||
|
$(obj)/op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue