diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-01-01 18:43:56 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-02 13:33:05 -0600 |
| commit | 503483336039a8b2b182535f87f4820d259fca82 (patch) | |
| tree | 827bb9f6b91a9ff66fd9ec2080ca6e7a4cf15fe3 | |
| parent | 74e91370beb3fabda515623b4491a8b7a024304a (diff) | |
| download | qemu-503483336039a8b2b182535f87f4820d259fca82.tar.gz qemu-503483336039a8b2b182535f87f4820d259fca82.tar.bz2 qemu-503483336039a8b2b182535f87f4820d259fca82.zip | |
tci: Fix broken builds with TCG interpreter
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 <sw@weilnetz.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | Makefile.target | 3 | ||||
| -rw-r--r-- | disas/Makefile.objs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.target b/Makefile.target index be8b8b86a5..5bfa496080 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 9134429845..3f5c5b9a21 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 |