From patchwork Tue Jan 1 17:43:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: tci: Fix broken builds with TCG interpreter From: Stefan Weil X-Patchwork-Id: 208954 Message-Id: <1357062236-22090-1-git-send-email-sw@weilnetz.de> To: Anthony Liguori Cc: Paolo Bonzini , qemu-devel@nongnu.org, Stefan Weil Date: Tue, 1 Jan 2013 18:43:56 +0100 TCI no longer compiled after commit 76cad71136b7eb371cf2a2a4e1621cfe8d9c769a. The TCI disassembler depends on data structures which are different for each QEMU target, so it cannot be compiled as a universal-obj today. Signed-off-by: Stefan Weil --- Makefile.target | 3 +-- disas/Makefile.objs | 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.target b/Makefile.target index be8b8b8..5bfa4960 100644 --- a/Makefile.target +++ b/Makefile.target @@ -69,13 +69,12 @@ all: $(PROGS) stap obj-y = exec.o translate-all.o cpu-exec.o obj-y += tcg/tcg.o tcg/optimize.o obj-$(CONFIG_TCG_INTERPRETER) += tci.o +obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o obj-y += fpu/softfloat.o obj-y += target-$(TARGET_BASE_ARCH)/ obj-y += disas.o obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o -tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci - ######################################################### # Linux user emulator target diff --git a/disas/Makefile.objs b/disas/Makefile.objs index 9134429..3f5c5b9 100644 --- a/disas/Makefile.objs +++ b/disas/Makefile.objs @@ -13,4 +13,6 @@ universal-obj-$(CONFIG_SH4_DIS) += sh4.o universal-obj-$(CONFIG_SPARC_DIS) += sparc.o universal-obj-$(CONFIG_LM32_DIS) += lm32.o -universal-obj-$(CONFIG_TCI_DIS) += tci.o +# TODO: As long as the TCG interpreter and its generated code depend +# on the QEMU target, we cannot compile the disassembler here. +#universal-obj-$(CONFIG_TCI_DIS) += tci.o