summaryrefslogtreecommitdiffstats
path: root/llvm/lib/Support/TargetParser.cpp
diff options
context:
space:
mode:
authorArtyom Skrobov <Artyom.Skrobov@arm.com>2015-11-20 16:46:09 +0000
committerArtyom Skrobov <Artyom.Skrobov@arm.com>2015-11-20 16:46:09 +0000
commit91f339ab3ffb4b7bfa9ad8f7793e143167bb7e34 (patch)
treeee2c7a761c1c71f67f68271eb436f4dc5479eeea /llvm/lib/Support/TargetParser.cpp
parent71e574543f8642bc05872760e577e8aee8d096b7 (diff)
downloadbcm5719-llvm-91f339ab3ffb4b7bfa9ad8f7793e143167bb7e34.tar.gz
bcm5719-llvm-91f339ab3ffb4b7bfa9ad8f7793e143167bb7e34.zip
Handle ARMv6-J as an alias, instead of fake architecture
Summary: This follows D14577 to treat ARMv6-J as an alias for ARMv6, instead of an architecture in its own right. The functional change is that the default CPU when targeting ARMv6-J changes from arm1136j-s to arm1136jf-s, which is currently used as the default CPU for ARMv6; both are, in fact, ARMv6-J CPUs. The J-bit (Jazelle support) is irrelevant to LLVM, and it doesn't affect code generation, attributes, optimizations, or anything else, apart from selecting the default CPU. Reviewers: rengolin, logan, compnerd Subscribers: aemerson, llvm-commits, rengolin Differential Revision: http://reviews.llvm.org/D14755 llvm-svn: 253675
Diffstat (limited to 'llvm/lib/Support/TargetParser.cpp')
-rw-r--r--llvm/lib/Support/TargetParser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/Support/TargetParser.cpp b/llvm/lib/Support/TargetParser.cpp
index 75e4b4bed56..3aa55b3c885 100644
--- a/llvm/lib/Support/TargetParser.cpp
+++ b/llvm/lib/Support/TargetParser.cpp
@@ -400,6 +400,7 @@ static StringRef getArchSynonym(StringRef Arch) {
return StringSwitch<StringRef>(Arch)
.Case("v5", "v5t")
.Case("v5e", "v5te")
+ .Case("v6j", "v6")
.Case("v6hl", "v6k")
.Cases("v6m", "v6sm", "v6s-m", "v6-m")
.Cases("v6z", "v6zk", "v6kz")
@@ -579,7 +580,6 @@ unsigned llvm::ARM::parseArchVersion(StringRef Arch) {
case ARM::AK_ARMV5TEJ:
return 5;
case ARM::AK_ARMV6:
- case ARM::AK_ARMV6J:
case ARM::AK_ARMV6K:
case ARM::AK_ARMV6T2:
case ARM::AK_ARMV6KZ:
OpenPOWER on IntegriCloud