diff options
| author | Tim Northover <tnorthover@apple.com> | 2014-07-23 12:32:47 +0000 |
|---|---|---|
| committer | Tim Northover <tnorthover@apple.com> | 2014-07-23 12:32:47 +0000 |
| commit | e19bed7d33f1e3083fe48edc7627f8b961848e3f (patch) | |
| tree | 941a3a2e3d878810d48fcd7cde0c3a173d390a1a /llvm/lib/Object/MachOObjectFile.cpp | |
| parent | 54d8ee6d7b5843c7850e0c1f4ae702f1b810fb5c (diff) | |
| download | llvm-e19bed7d33f1e3083fe48edc7627f8b961848e3f.zip llvm-e19bed7d33f1e3083fe48edc7627f8b961848e3f.tar.gz llvm-e19bed7d33f1e3083fe48edc7627f8b961848e3f.tar.bz2 | |
AArch64: remove arm64 triple enumerator.
Having both Triple::arm64 and Triple::aarch64 is extremely confusing, and
invites bugs where only one is checked. In reality, the only legitimate
difference between the two (arm64 usually means iOS) is also present in the OS
part of the triple and that's what should be checked.
We still parse the "arm64" triple, just canonicalise it to Triple::aarch64, so
there aren't any LLVM-side test changes.
llvm-svn: 213743
Diffstat (limited to 'llvm/lib/Object/MachOObjectFile.cpp')
| -rw-r--r-- | llvm/lib/Object/MachOObjectFile.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/Object/MachOObjectFile.cpp b/llvm/lib/Object/MachOObjectFile.cpp index 51c4c33..fe5c29d 100644 --- a/llvm/lib/Object/MachOObjectFile.cpp +++ b/llvm/lib/Object/MachOObjectFile.cpp @@ -755,7 +755,6 @@ MachOObjectFile::getRelocationTypeName(DataRefImpl Rel, res = Table[RType]; break; } - case Triple::arm64: case Triple::aarch64: { static const char *const Table[] = { "ARM64_RELOC_UNSIGNED", "ARM64_RELOC_SUBTRACTOR", @@ -1303,7 +1302,7 @@ Triple::ArchType MachOObjectFile::getArch(uint32_t CPUType) { case llvm::MachO::CPU_TYPE_ARM: return Triple::arm; case llvm::MachO::CPU_TYPE_ARM64: - return Triple::arm64; + return Triple::aarch64; case llvm::MachO::CPU_TYPE_POWERPC: return Triple::ppc; case llvm::MachO::CPU_TYPE_POWERPC64: |