From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksw-00077M-K2 for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZQksv-0000jj-Ap for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:10 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:33286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZQksv-0000j8-4c for qemu-devel@nongnu.org; Sat, 15 Aug 2015 19:29:09 -0400 Received: by pabyb7 with SMTP id yb7so82023992pab.0 for ; Sat, 15 Aug 2015 16:29:08 -0700 (PDT) From: Peter Crosthwaite Date: Sat, 15 Aug 2015 16:28:28 -0700 Message-Id: <54d29b8eefebfbf757830df47f3f520d08277ae9.1439679104.git.crosthwaite.peter@gmail.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Eduardo Habkost , Peter Crosthwaite , riku.voipio@iki.fi, Peter Crosthwaite , pbonzini@redhat.com, Richard Henderson From: Peter Crosthwaite Rename ELF_MACHINE to be I386 specific. This is used as-is by the multiboot loader. Linux-user previously used this definition but will not anymore, falling back to the default bahaviour of using ELF_ARCH as ELF_MACHINE. This removes another architecture specific definition from the global namespace. Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Peter Crosthwaite --- hw/i386/multiboot.c | 2 +- target-i386/cpu.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c index 1adbe9e..6774a19 100644 --- a/hw/i386/multiboot.c +++ b/hw/i386/multiboot.c @@ -195,7 +195,7 @@ int load_multiboot(FWCfgState *fw_cfg, } kernel_size = load_elf(kernel_filename, NULL, NULL, &elf_entry, - &elf_low, &elf_high, 0, ELF_MACHINE, 0); + &elf_low, &elf_high, 0, I386_ELF_MACHINE, 0); if (kernel_size < 0) { fprintf(stderr, "Error while loading elf kernel\n"); exit(1); diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 74b674d..bec5e72 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -36,10 +36,10 @@ #define TARGET_HAS_PRECISE_SMC #ifdef TARGET_X86_64 -#define ELF_MACHINE EM_X86_64 +#define I386_ELF_MACHINE EM_X86_64 #define ELF_MACHINE_UNAME "x86_64" #else -#define ELF_MACHINE EM_386 +#define I386_ELF_MACHINE EM_386 #define ELF_MACHINE_UNAME "i686" #endif -- 1.9.1