[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific |
Date: |
Sat, 15 Aug 2015 16:28:28 -0700 |
From: Peter Crosthwaite <address@hidden>
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 <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Eduardo Habkost <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
---
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
- [Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h, (continued)
- [Qemu-devel] [PATCH 11/19] tricore: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 12/19] xtensa: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 13/19] sh4: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 15/19] sparc: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 14/19] s390: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 16/19] mips: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 17/19] alpha: Remove ELF_MACHINE from cpu.h, Peter Crosthwaite, 2015/08/15
- [Qemu-devel] [PATCH 18/19] i386: Rename ELF_MACHINE to be x86 specific,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH 19/19] ppc: Rename ELF_MACHINE to be PPC specific, Peter Crosthwaite, 2015/08/15
- Message not available
- Re: [Qemu-devel] [PATCH 00/19] multi-arch+linux-user: Cleanup ELF_MACHINE, Richard Henderson, 2015/08/17
- Re: [Qemu-devel] [PATCH 00/19] multi-arch+linux-user: Cleanup ELF_MACHINE, Riku Voipio, 2015/08/20