diff options
| author | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-06-04 21:31:41 +0000 |
|---|---|---|
| committer | Artyom Skrobov <Artyom.Skrobov@arm.com> | 2015-06-04 21:31:41 +0000 |
| commit | 902ac2d8371c32b20ca6fa5d79db32749a6472ea (patch) | |
| tree | 37c93d0c7d55c87f229c978cf447e5f6ffa9822b | |
| parent | a2f6027a310eeeeb22a8f714606d55d7ff461e6e (diff) | |
| download | bcm5719-llvm-902ac2d8371c32b20ca6fa5d79db32749a6472ea.tar.gz bcm5719-llvm-902ac2d8371c32b20ca6fa5d79db32749a6472ea.zip | |
Simplify ARMTargetParser::parseArch(ARMTargetParser::getCanonical()), following r239099
Reviewers: rengolin
Reviewed By: rengolin
Subscribers: cfe-commits
Differential Revision: http://reviews.llvm.org/D10256
llvm-svn: 239101
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 4 | ||||
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 06993e74468..c0c69248458 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -4188,9 +4188,7 @@ public: // FIXME: This should be based on Arch attributes, not CPU names. void getDefaultFeatures(llvm::StringMap<bool> &Features) const override { StringRef ArchName = getTriple().getArchName(); - unsigned ArchKind = - llvm::ARMTargetParser::parseArch( - llvm::ARMTargetParser::getCanonicalArchName(ArchName)); + unsigned ArchKind = llvm::ARMTargetParser::parseArch(ArchName); bool IsV8 = (ArchKind == llvm::ARM::AK_ARMV8A || ArchKind == llvm::ARM::AK_ARMV8_1A); diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 43536cbb8dc..3e628eb0c8e 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -758,7 +758,6 @@ static void getARMTargetFeatures(const Driver &D, const llvm::Triple &Triple, // to handle -march=native correctly. if (const Arg *A = Args.getLastArg(options::OPT_march_EQ)) { StringRef Arch = arm::getARMArch(Args, Triple); - Arch = llvm::ARMTargetParser::getCanonicalArchName(Arch); if (llvm::ARMTargetParser::parseArch(Arch) == llvm::ARM::AK_INVALID) D.Diag(diag::err_drv_clang_unsupported) << A->getAsString(Args); } @@ -5768,12 +5767,9 @@ std::string arm::getARMTargetCPU(const ArgList &Args, /// CPU (or Arch, if CPU is generic). // FIXME: This is redundant with -mcpu, why does LLVM use this. const char *arm::getLLVMArchSuffixForARM(StringRef CPU, StringRef Arch) { - if (CPU == "generic") { - unsigned ArchKind = llvm::ARMTargetParser::parseArch( - llvm::ARMTargetParser::getCanonicalArchName(Arch)); - if (ArchKind == llvm::ARM::AK_ARMV8_1A) - return "v8.1a"; - } + if (CPU == "generic" && + llvm::ARMTargetParser::parseArch(Arch) == llvm::ARM::AK_ARMV8_1A) + return "v8.1a"; unsigned ArchKind = llvm::ARMTargetParser::parseCPUArch(CPU); if (ArchKind == llvm::ARM::AK_INVALID) |
