Commit 50348333 authored by Stefan Weil's avatar Stefan Weil Committed by Anthony Liguori
Browse files

tci: Fix broken builds with TCG interpreter 



TCI no longer compiled after commit 76cad711.

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: default avatarStefan Weil <sw@weilnetz.de>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 74e91370

Makefile.target

+1 −2
Original line number Diff line number Diff line
@@ -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

disas/Makefile.objs

+3 −1
Original line number Diff line number Diff line
@@ -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