diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/include/llvm/BinaryFormat/MachO.h | 5 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml | 11 | ||||
| -rw-r--r-- | llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test | 6 | ||||
| -rw-r--r-- | llvm/tools/llvm-objdump/MachODump.cpp | 7 | ||||
| -rw-r--r-- | llvm/tools/llvm-readobj/MachODumper.cpp | 1 |
5 files changed, 29 insertions, 1 deletions
diff --git a/llvm/include/llvm/BinaryFormat/MachO.h b/llvm/include/llvm/BinaryFormat/MachO.h index 08fe7803d40..e0258b13885 100644 --- a/llvm/include/llvm/BinaryFormat/MachO.h +++ b/llvm/include/llvm/BinaryFormat/MachO.h @@ -1477,7 +1477,10 @@ enum CPUSubTypeARM { CPU_SUBTYPE_ARM_V7EM = 16 }; -enum CPUSubTypeARM64 { CPU_SUBTYPE_ARM64_ALL = 0 }; +enum CPUSubTypeARM64 { + CPU_SUBTYPE_ARM64_ALL = 0, + CPU_SUBTYPE_ARM64E = 2, +}; enum CPUSubTypeSPARC { CPU_SUBTYPE_SPARC_ALL = 0 }; diff --git a/llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml b/llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml new file mode 100644 index 00000000000..02403554b2f --- /dev/null +++ b/llvm/test/tools/llvm-objdump/AArch64/Inputs/arm64e.macho.yaml @@ -0,0 +1,11 @@ +--- !mach-o +FileHeader: + magic: 0xFEEDFACF + cputype: 0x0100000C + cpusubtype: 0x00000002 + filetype: 0x00000001 + ncmds: 0 + sizeofcmds: 0 + flags: 0x00000000 + reserved: 0x00000000 +... diff --git a/llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test b/llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test new file mode 100644 index 00000000000..cd001cf7815 --- /dev/null +++ b/llvm/test/tools/llvm-objdump/AArch64/macho-arm64e.test @@ -0,0 +1,6 @@ +// RUN: yaml2obj %p/Inputs/arm64e.macho.yaml -o %tarm64e.o +// RUN: llvm-objdump -p %tarm64e.o | FileCheck -strict-whitespace %s + +CHECK: Mach header +CHECK-NEXT: magic cputype cpusubtype caps filetype ncmds sizeofcmds flags +CHECK-NEXT: MH_MAGIC_64 ARM64 E 0x00 OBJECT 0 0 0x00000000 diff --git a/llvm/tools/llvm-objdump/MachODump.cpp b/llvm/tools/llvm-objdump/MachODump.cpp index 54c954340f8..23dc18f151d 100644 --- a/llvm/tools/llvm-objdump/MachODump.cpp +++ b/llvm/tools/llvm-objdump/MachODump.cpp @@ -2009,6 +2009,10 @@ static void printCPUType(uint32_t cputype, uint32_t cpusubtype) { outs() << " cputype CPU_TYPE_ARM64\n"; outs() << " cpusubtype CPU_SUBTYPE_ARM64_ALL\n"; break; + case MachO::CPU_SUBTYPE_ARM64E: + outs() << " cputype CPU_TYPE_ARM64\n"; + outs() << " cpusubtype CPU_SUBTYPE_ARM64E\n"; + break; default: printUnknownCPUType(cputype, cpusubtype); break; @@ -8084,6 +8088,9 @@ static void PrintMachHeader(uint32_t magic, uint32_t cputype, case MachO::CPU_SUBTYPE_ARM64_ALL: outs() << " ALL"; break; + case MachO::CPU_SUBTYPE_ARM64E: + outs() << " E"; + break; default: outs() << format(" %10d", cpusubtype & ~MachO::CPU_SUBTYPE_MASK); break; diff --git a/llvm/tools/llvm-readobj/MachODumper.cpp b/llvm/tools/llvm-readobj/MachODumper.cpp index 0cb954c1ed8..07f9c637911 100644 --- a/llvm/tools/llvm-readobj/MachODumper.cpp +++ b/llvm/tools/llvm-readobj/MachODumper.cpp @@ -162,6 +162,7 @@ static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM[] = { static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesARM64[] = { LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64_ALL), + LLVM_READOBJ_ENUM_ENT(MachO, CPU_SUBTYPE_ARM64E), }; static const EnumEntry<uint32_t> MachOHeaderCpuSubtypesSPARC[] = { |
