diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-09-03 20:12:08 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-09-10 19:11:28 +0100 |
| commit | 15ee776bf2001883781cc83d456249a60532bb01 (patch) | |
| tree | 013dafaf949d3791a5d56a0e87848a78390ad5f1 /target-arm | |
| parent | d14d42f19bf3dcef5c81ec2324843121f552a6fc (diff) | |
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
Diffstat (limited to 'target-arm')
| -rw-r--r-- | target-arm/cpu.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 09206b5971..e8faadb209 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -288,8 +288,6 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp) acc->parent_realize(dev, errp); } -/* CPU models */ - static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; @@ -309,6 +307,9 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) 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) { ARMCPU *cpu = ARM_CPU(obj); @@ -837,6 +838,8 @@ static void arm_any_initfn(Object *obj) } #endif +#endif /* !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) */ + typedef struct ARMCPUInfo { const char *name; void (*initfn)(Object *obj); @@ -844,6 +847,7 @@ typedef struct ARMCPUInfo { } ARMCPUInfo; static const ARMCPUInfo arm_cpus[] = { +#if !defined(CONFIG_USER_ONLY) || !defined(TARGET_AARCH64) { .name = "arm926", .initfn = arm926_initfn }, { .name = "arm946", .initfn = arm946_initfn }, { .name = "arm1026", .initfn = arm1026_initfn }, @@ -879,6 +883,7 @@ static const ARMCPUInfo arm_cpus[] = { #ifdef CONFIG_USER_ONLY { .name = "any", .initfn = arm_any_initfn }, #endif +#endif }; static void arm_cpu_class_init(ObjectClass *oc, void *data) |