i386: Rename ELF_MACHINE to be x86 specific

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.

Backports commit a5e8788f89312f19f54dba0454ee5bf7209b4cd7 from qemu
This commit is contained in:
Peter Crosthwaite 2018-02-16 00:23:46 -05:00 committed by Lioncash
parent 95bcb2f144
commit 1faea35feb
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -38,10 +38,10 @@
#define TARGET_HAS_ICE 1
#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