From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAh-0002yT-Pe for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZePAd-0001LR-P8 for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48829) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZePAd-0001LJ-K7 for qemu-devel@nongnu.org; Tue, 22 Sep 2015 11:07:51 -0400 From: Paolo Bonzini Date: Tue, 22 Sep 2015 17:06:03 +0200 Message-Id: <1442934371-12567-41-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 40/48] tricore: Remove ELF_MACHINE from cpu.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Bastian Koppelmann , Peter Crosthwaite , Peter Crosthwaite From: Peter Crosthwaite The bootloader can just pass EM_TRICORE directly, as that is architecture specific code. This removes another architecture specific definition from the global namespace. Cc: Bastian Koppelmann Acked-By: Bastian Koppelmann Reviewed-by: Richard Henderson Acked-By: Riku Voipio Signed-off-by: Peter Crosthwaite Signed-off-by: Paolo Bonzini --- hw/tricore/tricore_testboard.c | 2 +- target-tricore/cpu.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c index 8532410..4ff5e7b 100644 --- a/hw/tricore/tricore_testboard.c +++ b/hw/tricore/tricore_testboard.c @@ -44,7 +44,7 @@ static void tricore_load_kernel(CPUTriCoreState *env) kernel_size = load_elf(tricoretb_binfo.kernel_filename, NULL, NULL, (uint64_t *)&entry, NULL, NULL, 0, - ELF_MACHINE, 1); + EM_TRICORE, 1); if (kernel_size <= 0) { error_report("qemu: no kernel file '%s'", tricoretb_binfo.kernel_filename); diff --git a/target-tricore/cpu.h b/target-tricore/cpu.h index 42751e8..20a12f3 100644 --- a/target-tricore/cpu.h +++ b/target-tricore/cpu.h @@ -25,8 +25,6 @@ #include "exec/cpu-defs.h" #include "fpu/softfloat.h" -#define ELF_MACHINE EM_TRICORE - #define CPUArchState struct CPUTriCoreState struct CPUTriCoreState; -- 2.5.0