From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAX-0002cr-9Q for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZePAR-0001Fm-Lq for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35231) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAR-0001Fe-AJ for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:39 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:05:58 +0200 Message-Id: <1442934371-12567-36-git-send-email-pbonzini@redhat.com> In-Reply-To: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> References: <1442934371-12567-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 35/48] cris: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , Peter Crosthwaite , 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_CRIS directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Edgar E. Iglesias Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- 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