maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Driver: honour the clang-cl behaviour on ARM as well 

Unfortunately, MSVC does not indicate to the driver what target is being used.
This means that we cannot correctly select the target architecture for the
clang_rt component.  This breaks down when targeting windows with the clang
driver as opposed to the clang-cl driver.  This should fix the native ARM
buildbot tests.

llvm-svn: 225089
This commit is contained in:
Saleem Abdulrasool 2015-01-02 21:47:33 +00:00
parent c426c337ed
commit 61770ab26f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Driver/Tools.cpp
View File

@ -2103,11 +2103,12 @@ static void CollectArgsForIntegratedAssembler(Compilation &C,
// Until ARM libraries are build separately, we have them all in one library
static StringRef getArchNameForCompilerRTLib(const ToolChain &TC) {
// FIXME: handle 64-bit
if (TC.getTriple().isOSWindows() &&
!TC.getTriple().isWindowsItaniumEnvironment())
return "i386";
if (TC.getArch() == llvm::Triple::arm || TC.getArch() == llvm::Triple::armeb)
return "arm";
// FIXME: handle 64-bit
if (TC.getTriple().isOSWindows())
return "i386";
return TC.getArchName();
}