提交 74d7fc7f 编写于 作者: R Richard Henderson 提交者: Peter Maydell

tcg: Avoid setting tcg_initialize if !CONFIG_TCG

Fix the build for --disable-tcg.

Fixes: 55c3ceefSigned-off-by: NRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: NEduardo Habkost <ehabkost@redhat.com>
Message-id: 20171026135814.20773-1-richard.henderson@linaro.org
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
上级 325a084c
...@@ -1760,7 +1760,9 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) ...@@ -1760,7 +1760,9 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data)
#endif #endif
cc->disas_set_info = arm_disas_set_info; cc->disas_set_info = arm_disas_set_info;
#ifdef CONFIG_TCG
cc->tcg_initialize = arm_translate_init; cc->tcg_initialize = arm_translate_init;
#endif
} }
static void cpu_register(const ARMCPUInfo *info) static void cpu_register(const ARMCPUInfo *info)
......
...@@ -4212,7 +4212,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data) ...@@ -4212,7 +4212,9 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)
#endif #endif
cc->cpu_exec_enter = x86_cpu_exec_enter; cc->cpu_exec_enter = x86_cpu_exec_enter;
cc->cpu_exec_exit = x86_cpu_exec_exit; cc->cpu_exec_exit = x86_cpu_exec_exit;
#ifdef CONFIG_TCG
cc->tcg_initialize = tcg_x86_init; cc->tcg_initialize = tcg_x86_init;
#endif
dc->user_creatable = true; dc->user_creatable = true;
} }
......
...@@ -198,7 +198,9 @@ static void mips_cpu_class_init(ObjectClass *c, void *data) ...@@ -198,7 +198,9 @@ static void mips_cpu_class_init(ObjectClass *c, void *data)
cc->vmsd = &vmstate_mips_cpu; cc->vmsd = &vmstate_mips_cpu;
#endif #endif
cc->disas_set_info = mips_cpu_disas_set_info; cc->disas_set_info = mips_cpu_disas_set_info;
#ifdef CONFIG_TCG
cc->tcg_initialize = mips_tcg_init; cc->tcg_initialize = mips_tcg_init;
#endif
cc->gdb_num_core_regs = 73; cc->gdb_num_core_regs = 73;
cc->gdb_stop_before_watchpoint = true; cc->gdb_stop_before_watchpoint = true;
......
...@@ -10578,7 +10578,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data) ...@@ -10578,7 +10578,9 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)
#ifndef CONFIG_USER_ONLY #ifndef CONFIG_USER_ONLY
cc->virtio_is_big_endian = ppc_cpu_is_big_endian; cc->virtio_is_big_endian = ppc_cpu_is_big_endian;
#endif #endif
#ifdef CONFIG_TCG
cc->tcg_initialize = ppc_translate_init; cc->tcg_initialize = ppc_translate_init;
#endif
dc->fw_name = "PowerPC,UNKNOWN"; dc->fw_name = "PowerPC,UNKNOWN";
} }
......
...@@ -497,7 +497,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data) ...@@ -497,7 +497,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
#endif #endif
#endif #endif
cc->disas_set_info = s390_cpu_disas_set_info; cc->disas_set_info = s390_cpu_disas_set_info;
#ifdef CONFIG_TCG
cc->tcg_initialize = s390x_translate_init; cc->tcg_initialize = s390x_translate_init;
#endif
cc->gdb_num_core_regs = S390_NUM_CORE_REGS; cc->gdb_num_core_regs = S390_NUM_CORE_REGS;
cc->gdb_core_xml_file = "s390x-core64.xml"; cc->gdb_core_xml_file = "s390x-core64.xml";
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册