diff options
| author | Ahmed Bougacha <ahmed@bougacha.org> | 2020-09-03 08:43:21 -0700 |
|---|---|---|
| committer | Ahmed Bougacha <ahmed@bougacha.org> | 2020-12-03 07:53:59 -0800 |
| commit | f77c948d56b09b839262e258af5c6ad701e5b168 (patch) | |
| tree | 980b312c58d95790978e6a4a40d36a87d9596e7c /llvm/lib/Object/MachOObjectFile.cpp | |
| parent | 45ec3a37b0a54e34e8f47cdac2be495838f93675 (diff) | |
| download | llvm-f77c948d56b09b839262e258af5c6ad701e5b168.zip llvm-f77c948d56b09b839262e258af5c6ad701e5b168.tar.gz llvm-f77c948d56b09b839262e258af5c6ad701e5b168.tar.bz2 | |
[Triple][MachO] Define "arm64e", an AArch64 subarch for Pointer Auth.
This also teaches MachO writers/readers about the MachO cpu subtype,
beyond the minimal subtype reader support present at the moment.
This also defines a preprocessor macro to allow users to distinguish
__arm64__ from __arm64e__.
arm64e defaults to an "apple-a12" CPU, which supports v8.3a, allowing
pointer-authentication codegen.
It also currently defaults to ios14 and macos11.
Differential Revision: https://reviews.llvm.org/D87095
Diffstat (limited to 'llvm/lib/Object/MachOObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index a10b85c..9ed2b8a 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -2694,6 +2694,12 @@ Triple MachOObjectFile::getArchTriple(uint32_t CPUType, uint32_t CPUSubType, if (ArchFlag) *ArchFlag = "arm64"; return Triple("arm64-apple-darwin"); + case MachO::CPU_SUBTYPE_ARM64E: + if (McpuDefault) + *McpuDefault = "apple-a12"; + if (ArchFlag) + *ArchFlag = "arm64e"; + return Triple("arm64e-apple-darwin"); default: return Triple(); } @@ -2741,13 +2747,28 @@ bool MachOObjectFile::isValidArch(StringRef ArchFlag) { } ArrayRef<StringRef> MachOObjectFile::getValidArchs() { - static const std::array<StringRef, 17> validArchs = {{ - "i386", "x86_64", "x86_64h", "armv4t", "arm", "armv5e", - "armv6", "armv6m", "armv7", "armv7em", "armv7k", "armv7m", - "armv7s", "arm64", "arm64_32", "ppc", "ppc64", + static const std::array<StringRef, 18> ValidArchs = {{ + "i386", + "x86_64", + "x86_64h", + "armv4t", + "arm", + "armv5e", + "armv6", + "armv6m", + "armv7", + "armv7em", + "armv7k", + "armv7m", + "armv7s", + "arm64", + "arm64e", + "arm64_32", + "ppc", + "ppc64", }}; - return validArchs; + return ValidArchs; } Triple::ArchType MachOObjectFile::getArch() const { |