diff options
| -rw-r--r-- | docs/yaml2obj.rst | 2 | ||||
| -rw-r--r-- | include/llvm/Support/COFF.h | 2 | ||||
| -rw-r--r-- | lib/Object/COFFYAML.cpp | 2 | ||||
| -rw-r--r-- | tools/llvm-readobj/COFFDumper.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/yaml2obj.rst b/docs/yaml2obj.rst index 2c55f02f0d..1812e58914 100644 --- a/docs/yaml2obj.rst +++ b/docs/yaml2obj.rst @@ -64,7 +64,7 @@ Here's a simplified Kwalify_ schema with an extension to allow alternate types. , IMAGE_FILE_MACHINE_AM33 , IMAGE_FILE_MACHINE_AMD64 , IMAGE_FILE_MACHINE_ARM - , IMAGE_FILE_MACHINE_ARMV7 + , IMAGE_FILE_MACHINE_ARMNT , IMAGE_FILE_MACHINE_EBC , IMAGE_FILE_MACHINE_I386 , IMAGE_FILE_MACHINE_IA64 diff --git a/include/llvm/Support/COFF.h b/include/llvm/Support/COFF.h index 309b3df23c..7e796ed092 100644 --- a/include/llvm/Support/COFF.h +++ b/include/llvm/Support/COFF.h @@ -59,7 +59,7 @@ namespace COFF { IMAGE_FILE_MACHINE_AM33 = 0x13, IMAGE_FILE_MACHINE_AMD64 = 0x8664, IMAGE_FILE_MACHINE_ARM = 0x1C0, - IMAGE_FILE_MACHINE_ARMV7 = 0x1C4, + IMAGE_FILE_MACHINE_ARMNT = 0x1C4, IMAGE_FILE_MACHINE_EBC = 0xEBC, IMAGE_FILE_MACHINE_I386 = 0x14C, IMAGE_FILE_MACHINE_IA64 = 0x200, diff --git a/lib/Object/COFFYAML.cpp b/lib/Object/COFFYAML.cpp index e549b4e9ea..2a0c07a391 100644 --- a/lib/Object/COFFYAML.cpp +++ b/lib/Object/COFFYAML.cpp @@ -29,7 +29,7 @@ void ScalarEnumerationTraits<COFF::MachineTypes>::enumeration( ECase(IMAGE_FILE_MACHINE_AM33); ECase(IMAGE_FILE_MACHINE_AMD64); ECase(IMAGE_FILE_MACHINE_ARM); - ECase(IMAGE_FILE_MACHINE_ARMV7); + ECase(IMAGE_FILE_MACHINE_ARMNT); ECase(IMAGE_FILE_MACHINE_EBC); ECase(IMAGE_FILE_MACHINE_I386); ECase(IMAGE_FILE_MACHINE_IA64); diff --git a/tools/llvm-readobj/COFFDumper.cpp b/tools/llvm-readobj/COFFDumper.cpp index c33af18fe9..613cc5b7c9 100644 --- a/tools/llvm-readobj/COFFDumper.cpp +++ b/tools/llvm-readobj/COFFDumper.cpp @@ -228,7 +228,7 @@ static const EnumEntry<COFF::MachineTypes> ImageFileMachineType[] = { LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AM33 ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_AMD64 ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARM ), - LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARMV7 ), + LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_ARMNT ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_EBC ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_I386 ), LLVM_READOBJ_ENUM_ENT(COFF, IMAGE_FILE_MACHINE_IA64 ), |