diff --git a/llvm/include/llvm/BinaryFormat/MachO.h b/llvm/include/llvm/BinaryFormat/MachO.h --- a/llvm/include/llvm/BinaryFormat/MachO.h +++ b/llvm/include/llvm/BinaryFormat/MachO.h @@ -1492,6 +1492,7 @@ enum CPUSubTypeARM64 { CPU_SUBTYPE_ARM64_ALL = 0, + CPU_SUBTYPE_ARM64_V8 = 1, CPU_SUBTYPE_ARM64E = 2, }; diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/arm64_v8.macho.yaml b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/arm64_v8.macho.yaml new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/Inputs/arm64_v8.macho.yaml @@ -0,0 +1,11 @@ +--- !mach-o +FileHeader: + magic: 0xFEEDFACF + cputype: 0x0100000C + cpusubtype: 0x00000001 + filetype: 0x00000001 + ncmds: 0 + sizeofcmds: 0 + flags: 0x00000000 + reserved: 0x00000000 +... diff --git a/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64-v8.test b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64-v8.test new file mode 100644 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/MachO/AArch64/macho-arm64-v8.test @@ -0,0 +1,6 @@ +// RUN: yaml2obj %p/Inputs/arm64_v8.macho.yaml -o %tarm-v8.o +// RUN: llvm-objdump -p %tarm-v8.o | FileCheck --strict-whitespace %s + +CHECK: Mach header +CHECK-NEXT: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags +CHECK-NEXT: MH_MAGIC_64 ARM64 V8 0x00 OBJECT 0 0 0x00000000 diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -2109,6 +2109,10 @@ outs() << " cputype CPU_TYPE_ARM64\n"; outs() << " cpusubtype CPU_SUBTYPE_ARM64_ALL\n"; break; + case MachO::CPU_SUBTYPE_ARM64_V8: + outs() << " cputype CPU_TYPE_ARM64\n"; + outs() << " cpusubtype CPU_SUBTYPE_ARM64_V8\n"; + break; case MachO::CPU_SUBTYPE_ARM64E: outs() << " cputype CPU_TYPE_ARM64\n"; outs() << " cpusubtype CPU_SUBTYPE_ARM64E\n"; @@ -8315,6 +8319,9 @@ case MachO::CPU_SUBTYPE_ARM64_ALL: outs() << " ALL"; break; + case MachO::CPU_SUBTYPE_ARM64_V8: + outs() << " V8"; + break; case MachO::CPU_SUBTYPE_ARM64E: outs() << " E"; break; diff --git a/llvm/tools/llvm-readobj/MachODumper.cpp b/llvm/tools/llvm-readobj/MachODumper.cpp --- a/llvm/tools/llvm-readobj/MachODumper.cpp +++ b/llvm/tools/llvm-readobj/MachODumper.cpp @@ -161,8 +161,9 @@ }; static const EnumEntry MachOHeaderCpuSubtypesARM64[] = { - LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL), - LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E), + LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL), + LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_V8), + LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E), }; static const EnumEntry MachOHeaderCpuSubtypesSPARC[] = {