ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-arm: Disable 32 bit CPUs in 64 bit linux-user builds 

If we're building aarch64-linux-user then the 32 bit CPUs are
all unwanted, because they can't possibly execute the 64 bit
binaries we will be running; disable them.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1378235544-22290-9-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2013-09-03 20:12:08 +01:00
parent d14d42f19b
commit 15ee776bf2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
target-arm/cpu.c
View File

@ -288,8 +288,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)
acc->parent_realize(dev, errp); acc->parent_realize(dev, errp);
} }
/* CPU models */
static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
{ {
ObjectClass *oc; ObjectClass *oc;
@ -309,6 +307,9 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model)
return oc; return oc;
} }
/* CPU models. These are not needed for the AArch64 linux-user build. */
#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
static void arm926_initfn(Object *obj) static void arm926_initfn(Object *obj)
{ {
ARMCPU *cpu = ARM_CPU(obj); ARMCPU *cpu = ARM_CPU(obj);
@ -837,6 +838,8 @@ static void arm_any_initfn(Object *obj)
} }
#endif #endif
#endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */
typedef struct ARMCPUInfo { typedef struct ARMCPUInfo {
const char *name; const char *name;
void (*initfn)(Object *obj); void (*initfn)(Object *obj);
@ -844,6 +847,7 @@ typedef struct ARMCPUInfo {
} ARMCPUInfo; } ARMCPUInfo;
static const ARMCPUInfo arm_cpus[] = { static const ARMCPUInfo arm_cpus[] = {
#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64)
{ .name = "arm926", .initfn = arm926_initfn }, { .name = "arm926", .initfn = arm926_initfn },
{ .name = "arm946", .initfn = arm946_initfn }, { .name = "arm946", .initfn = arm946_initfn },
{ .name = "arm1026", .initfn = arm1026_initfn }, { .name = "arm1026", .initfn = arm1026_initfn },
@ -879,6 +883,7 @@ static const ARMCPUInfo arm_cpus[] = {
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
{ .name = "any", .initfn = arm_any_initfn }, { .name = "any", .initfn = arm_any_initfn },
#endif #endif
#endif
}; };
static void arm_cpu_class_init(ObjectClass *oc, void *data) static void arm_cpu_class_init(ObjectClass *oc, void *data)