[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 35/48] cris: Remove ELF_MACHINE from cpu.h
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 35/48] cris: Remove ELF_MACHINE from cpu.h |
Date: |
Tue, 22 Sep 2015 17:05:58 +0200 |
From: Peter Crosthwaite <address@hidden>
The only generic code relying on this is linux-user, but linux users'
default behaviour of defaulting ELF_MACHINE to ELF_ARCH will handle
this.
The bootloader can just pass EM_CRIS directly, as that is architecture
specific code.
This removes another architecture specific definition from the global
namespace.
Cc: Edgar E. Iglesias <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Acked-By: Riku Voipio <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/cris/boot.c | 2 +-
target-cris/cpu.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index 622f353..1cfa339 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -72,7 +72,7 @@ void cris_load_image(CRISCPU *cpu, struct cris_load_info *li)
/* Boots a kernel elf binary, os/linux-2.6/vmlinux from the axis
devboard SDK. */
image_size = load_elf(li->image_filename, translate_kernel_address, NULL,
- &entry, NULL, &high, 0, ELF_MACHINE, 0);
+ &entry, NULL, &high, 0, EM_CRIS, 0);
li->entry = entry;
if (image_size < 0) {
/* Takes a kimage from the axis devboard SDK. */
diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 8ae7708..d47fad4 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -29,8 +29,6 @@
#include "exec/cpu-defs.h"
-#define ELF_MACHINE EM_CRIS
-
#define EXCP_NMI 1
#define EXCP_GURU 2
#define EXCP_BUSFAULT 3
--
2.5.0
- [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, (continued)
- [Qemu-devel] [PULL 28/48] linux_user: elfload: Default ELF_MACHINE to ELF_ARCH, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 29/48] linux-user: elfload: Provide default for elf_check_arch, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 27/48] hmp: implemented io apic dump state for TCG, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 30/48] elf_ops: Fix coding style for EM alias case statement, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 33/48] mb: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 31/48] elf: Update EM_MOXIE definition, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 32/48] arm: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 36/48] moxie: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 37/48] unicore: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 34/48] m68k: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 35/48] cris: Remove ELF_MACHINE from cpu.h,
Paolo Bonzini <=
- [Qemu-devel] [PULL 38/48] lm32: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 40/48] tricore: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 39/48] or32: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 41/48] xtensa: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 42/48] sh4: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 43/48] s390: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 44/48] sparc: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 46/48] alpha: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 45/48] mips: Remove ELF_MACHINE from cpu.h, Paolo Bonzini, 2015/09/22
- [Qemu-devel] [PULL 47/48] i386: Rename ELF_MACHINE to be x86 specific, Paolo Bonzini, 2015/09/22