diff options
| author | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-06-04 21:26:58 +0000 |
|---|---|---|
| committer | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-06-04 21:26:58 +0000 |
| commit | 85aebc8c019bae882534790d960b24f5c27051ba (patch) | |
| tree | 302a61ef42a84301eb0f62c2a311762874347d57 /llvm/lib/Support/TargetParser.cpp | |
| parent | c925a905f7c73899bb17405a3a9f04b681a96cf8 (diff) | |
| download | llvm-85aebc8c019bae882534790d960b24f5c27051ba.zip llvm-85aebc8c019bae882534790d960b24f5c27051ba.tar.gz llvm-85aebc8c019bae882534790d960b24f5c27051ba.tar.bz2 | |
Simplify ARMTargetParser::getArchSynonym
Summary:
1) The only caller, ARMTargetParser::parseArch, uses the results for an "endswith" test; so, including the "arm" prefix into the result is unnecessary.
2) Most ARMTargetParser::parseArch callers pass it the output from ARMTargetParser::getCanonicalArchName; so, make this behaviour the default. Then, including the "arm" prefix into the cases is unnecessary.
Reviewers: rengolin
Reviewed By: rengolin
Subscribers: llvm-commits
Differential Revision: http://reviews.llvm.org/D10249
llvm-svn: 239099
Diffstat (limited to 'llvm/lib/Support/TargetParser.cpp')
| -rw-r--r-- | llvm/lib/Support/TargetParser.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/llvm/lib/Support/TargetParser.cpp b/llvm/lib/Support/TargetParser.cpp index 372f858..e09350e 100644 --- a/llvm/lib/Support/TargetParser.cpp +++ b/llvm/lib/Support/TargetParser.cpp @@ -293,16 +293,14 @@ StringRef ARMTargetParser::getFPUSynonym(StringRef FPU) { StringRef ARMTargetParser::getArchSynonym(StringRef Arch) { return StringSwitch<StringRef>(Arch) - .Cases("armv6sm", "v6sm", "armv6s-m") - .Cases("armv6m", "v6m", "armv6-m") - .Cases("armv7a", "v7a", "armv7-a") - .Cases("armv7r", "v7r", "armv7-r") - .Cases("armv7m", "v7m", "armv7-m") - .Cases("armv7em", "v7em", "armv7e-m") - .Cases("armv8", "v8", "armv8-a") - .Cases("armv8a", "v8a", "armv8-a") - .Cases("armv8.1a", "v8.1a", "armv8.1-a") - .Cases("aarch64", "arm64", "armv8-a") + .Case("v6sm", "v6s-m") + .Case("v6m", "v6-m") + .Case("v7a", "v7-a") + .Case("v7r", "v7-r") + .Case("v7m", "v7-m") + .Case("v7em", "v7e-m") + .Cases("v8", "v8a", "aarch64", "arm64", "armv8-a") + .Case("v8.1a", "v8.1-a") .Default(Arch); } @@ -370,6 +368,7 @@ unsigned ARMTargetParser::parseFPU(StringRef FPU) { // Allows partial match, ex. "v7a" matches "armv7a". unsigned ARMTargetParser::parseArch(StringRef Arch) { + Arch = getCanonicalArchName(Arch); StringRef Syn = getArchSynonym(Arch); for (const auto A : ARCHNames) { if (StringRef(A.Name).endswith(Syn)) |