Skip to content

Commit

Permalink
tci: Fix broken builds with TCG interpreter
Browse files Browse the repository at this point in the history
TCI no longer compiled after commit 76cad71.

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 <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
  • Loading branch information
stweil authored and Anthony Liguori committed Jan 2, 2013
1 parent 74e9137 commit 5034833
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 1 addition & 2 deletions Makefile.target
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion disas/Makefile.objs
Expand Up @@ -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

0 comments on commit 5034833

Please sign in to comment.