diff options
| author | Walter Lee <waltl@google.com> | 2017-12-19 16:19:11 +0000 |
|---|---|---|
| committer | Walter Lee <waltl@google.com> | 2017-12-19 16:19:11 +0000 |
| commit | 5062e6985e9f3804280b4ae7e84d69914966489d (patch) | |
| tree | f9fc86256cc951ad555f40d983990b10f54a6183 /clang/lib/Driver/ToolChains/Myriad.cpp | |
| parent | 348a4208e353f68ceecf6d61d2103abe165aaa76 (diff) | |
| download | bcm5719-llvm-5062e6985e9f3804280b4ae7e84d69914966489d.tar.gz bcm5719-llvm-5062e6985e9f3804280b4ae7e84d69914966489d.zip | |
Rename sparc-myriad-elf triplet to sparc-myriad-rtems
Summary: This is to be consistent with latest Movidius MDK releases.
Also, don't inherit any gcc paths for shave triple.
Reviewers: jyknight
Subscribers: emaste, fedor.sergeev
Differential Revision: https://reviews.llvm.org/D41295
llvm-svn: 321080
Diffstat (limited to 'clang/lib/Driver/ToolChains/Myriad.cpp')
| -rw-r--r-- | clang/lib/Driver/ToolChains/Myriad.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/clang/lib/Driver/ToolChains/Myriad.cpp b/clang/lib/Driver/ToolChains/Myriad.cpp index 6fdb5a2248d..06079b109dd 100644 --- a/clang/lib/Driver/ToolChains/Myriad.cpp +++ b/clang/lib/Driver/ToolChains/Myriad.cpp @@ -199,7 +199,7 @@ void tools::Myriad::Linker::ConstructJob(Compilation &C, const JobAction &JA, } std::string Exec = - Args.MakeArgString(TC.GetProgramPath("sparc-myriad-elf-ld")); + Args.MakeArgString(TC.GetProgramPath("sparc-myriad-rtems-ld")); C.addCommand(llvm::make_unique<Command>(JA, *this, Args.MakeArgString(Exec), CmdArgs, Inputs)); } @@ -218,10 +218,11 @@ MyriadToolChain::MyriadToolChain(const Driver &D, const llvm::Triple &Triple, D.Diag(clang::diag::err_target_unsupported_arch) << Triple.getArchName() << "myriad"; LLVM_FALLTHROUGH; + case llvm::Triple::shave: + return; case llvm::Triple::sparc: case llvm::Triple::sparcel: - case llvm::Triple::shave: - GCCInstallation.init(Triple, Args, {"sparc-myriad-elf"}); + GCCInstallation.init(Triple, Args, {"sparc-myriad-rtems"}); } if (GCCInstallation.isValid()) { @@ -231,7 +232,7 @@ MyriadToolChain::MyriadToolChain(const Driver &D, const llvm::Triple &Triple, addPathIfExists(D, CompilerSupportDir, getFilePaths()); } // libstd++ and libc++ must both be found in this one place. - addPathIfExists(D, D.Dir + "/../sparc-myriad-elf/lib", getFilePaths()); + addPathIfExists(D, D.Dir + "/../sparc-myriad-rtems/lib", getFilePaths()); } MyriadToolChain::~MyriadToolChain() {} |
