@@ -405,6 +405,7 @@ void register_m68k_insns (CPUM68KState *env);
#define M68K_CPU_TYPE_SUFFIX "-" TYPE_M68K_CPU
#define M68K_CPU_TYPE_NAME(model) model M68K_CPU_TYPE_SUFFIX
+#define TARGET_DEFAULT_CPU_TYPE M68K_CPU_TYPE_NAME("any")
#define cpu_signal_handler cpu_m68k_signal_handler
#define cpu_list m68k_cpu_list
@@ -4327,8 +4327,6 @@ int main(int argc, char **argv, char **envp)
#endif
#elif defined(TARGET_UNICORE32)
cpu_model = "any";
-#elif defined(TARGET_M68K)
- cpu_model = "any";
#elif defined(TARGET_SPARC)
#ifdef TARGET_SPARC64
cpu_model = "TI UltraSparc II";
it will be used for for 2 purposes, 1st is to provide to cpu name resolving class for machine 'none' cpu_parse_cpu_model(machine_class->default_cpu_type, cpu_model) and later to drop a bunch of ifdefs *-user/main.c that set default cpu_model. With the later in mind set it to 'any', which is current default for M68K targets. While at it, drop redundant ifdef in linux-user, as catch all #else sets default to the same 'any' model. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- CC: Riku Voipio <riku.voipio@iki.fi> CC: Laurent Vivier <laurent@vivier.eu> --- target/m68k/cpu.h | 1 + linux-user/main.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-)