From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56842) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksi-0006cF-Bo for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksg-0000ao-5C for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:56 -0400 Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:35548) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksf-0000ai-VO for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:28:54 -0400 Received: by pacgr6 with SMTP id gr6so82250879pac.2 for ; Sat, 15 Aug 2015 16:28:53 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 15 Aug 2015 16:28:20 -0700 Message-Id: <0dec707517f2d1a78f8c54218b537b30011ff75f.1439679104.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 10/19] or32: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Peter Crosthwaite , riku.voipio@iki.fi, Jia Liu , Peter Crosthwaite From: Peter Crosthwaite 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_OPENRISC directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Jia Liu Signed-off-by: Peter Crosthwaite --- hw/openrisc/openrisc_sim.c | 2 +- target-openrisc/cpu.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index 1da0657..fb6d8ea 100644 --- a/hw/openrisc/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c @@ -68,7 +68,7 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size, if (kernel_filename && !qtest_enabled()) { kernel_size = load_elf(kernel_filename, NULL, NULL, - &elf_entry, NULL, NULL, 1, ELF_MACHINE, 1); + &elf_entry, NULL, NULL, 1, EM_OPENRISC, 1); entry = elf_entry; if (kernel_size < 0) { kernel_size = load_uimage(kernel_filename, diff --git a/target-openrisc/cpu.h b/target-openrisc/cpu.h index 36c4f20..ac8b969 100644 --- a/target-openrisc/cpu.h +++ b/target-openrisc/cpu.h @@ -21,7 +21,6 @@ #define CPU_OPENRISC_H #define TARGET_LONG_BITS 32 -#define ELF_MACHINE EM_OPENRISC #define CPUArchState struct CPUOpenRISCState -- 1.9.1