diff options
| author | Bill Wendling <isanbard@gmail.com> | 2013-12-06 19:12:36 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2013-12-06 19:12:36 +0000 |
| commit | cf660bd73e72b6ac36cd4512828cd2ef992f119e (patch) | |
| tree | d13e5bcf3d23c6beffbbf1389a658b2b6fad7a56 | |
| parent | 21ba1e6ad00a27388d73d1e225ef2f7ae07763ab (diff) | |
| download | clang-cf660bd73e72b6ac36cd4512828cd2ef992f119e.tar.gz clang-cf660bd73e72b6ac36cd4512828cd2ef992f119e.tar.bz2 clang-cf660bd73e72b6ac36cd4512828cd2ef992f119e.tar.xz | |
Merging r196532:
------------------------------------------------------------------------
r196532 | joerg | 2013-12-05 13:07:29 -0800 (Thu, 05 Dec 2013) | 2 lines
Pass down the target CPU to the system assembler for NetBSD/ARM.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/cfe/branches/release_34@196596 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Driver/Tools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index b92b25eadb..09a969d6a9 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -5967,6 +5967,13 @@ void netbsd::Assemble::ConstructJob(Compilation &C, const JobAction &JA, if (getToolChain().getArch() == llvm::Triple::x86) CmdArgs.push_back("--32"); + // Pass the target CPU to GNU as for ARM, since the source code might + // not have the correct .cpu annotation. + if (getToolChain().getArch() == llvm::Triple::arm) { + std::string MArch(getARMTargetCPU(Args, getToolChain().getTriple())); + CmdArgs.push_back(Args.MakeArgString("-mcpu=" + MArch)); + } + // Set byte order explicitly if (getToolChain().getArch() == llvm::Triple::mips) CmdArgs.push_back("-EB"); |