diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/CodeGen/AArch64/dont-take-over-the-world.ll | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp b/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp index 1fee256c72c..f42ecb1677d 100644 --- a/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp +++ b/llvm/lib/Target/AArch64/TargetInfo/AArch64TargetInfo.cpp @@ -20,8 +20,9 @@ Target TheARM64Target; extern "C" void LLVMInitializeAArch64TargetInfo() { // Now register the "arm64" name for use with "-march". We don't want it to // take possession of the Triple::aarch64 tag though. - RegisterTarget<Triple::UnknownArch, /*HasJIT=*/true> X( - TheARM64Target, "arm64", "ARM64 (little endian)"); + TargetRegistry::RegisterTarget(TheARM64Target, "arm64", + "ARM64 (little endian)", + [](Triple::ArchType) { return false; }, true); RegisterTarget<Triple::aarch64, /*HasJIT=*/true> Z( TheAArch64leTarget, "aarch64", "AArch64 (little endian)"); diff --git a/llvm/test/CodeGen/AArch64/dont-take-over-the-world.ll b/llvm/test/CodeGen/AArch64/dont-take-over-the-world.ll new file mode 100644 index 00000000000..d9e13b745fd --- /dev/null +++ b/llvm/test/CodeGen/AArch64/dont-take-over-the-world.ll @@ -0,0 +1,7 @@ +; RUN: not llc -mtriple=x86-64 2>&1 | FileCheck %s + +; To support "arm64" as a -march option, we need to register a second AArch64 +; target, but we have to be careful how we do that so that it doesn't become the +; target of last resort when the specified triple is completely wrong. + +; CHECK: unable to get target for 'x86-64', see --version and --triple. |
