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/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h | |
| parent | 54d8ee6d7b5843c7850e0c1f4ae702f1b810fb5c (diff) | |
| download | bcm5719-llvm-e19bed7d33f1e3083fe48edc7627f8b961848e3f.tar.gz bcm5719-llvm-e19bed7d33f1e3083fe48edc7627f8b961848e3f.zip | |
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/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h')
| -rw-r--r-- | llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h index 59fdfbe3252..599c1e44281 100644 --- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h +++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h @@ -58,8 +58,7 @@ class RuntimeDyldELF : public RuntimeDyldImpl { uint64_t Value, uint32_t Type, int64_t Addend); unsigned getMaxStubSize() override { - if (Arch == Triple::aarch64 || Arch == Triple::arm64 || - Arch == Triple::aarch64_be || Arch == Triple::arm64_be) + if (Arch == Triple::aarch64 || Arch == Triple::aarch64_be) return 20; // movz; movk; movk; movk; br if (Arch == Triple::arm || Arch == Triple::thumb) return 8; // 32-bit instruction and 32-bit address |
