diff options
| author | Joerg Sonnenberger <joerg@bec.de> | 2014-09-10 21:25:37 +0000 |
|---|---|---|
| committer | Joerg Sonnenberger <joerg@bec.de> | 2014-09-10 21:25:37 +0000 |
| commit | b7e0ac625364c19f4741ead3f4a13a2e8ad101b2 (patch) | |
| tree | 7c1e73f3733dc9845b583f5794fcf1c4bbd4b14d /clang/lib/Driver/Driver.cpp | |
| parent | 8123630a2184921a62e2314b8dce878bc0a4d864 (diff) | |
| download | bcm5719-llvm-b7e0ac625364c19f4741ead3f4a13a2e8ad101b2.tar.gz bcm5719-llvm-b7e0ac625364c19f4741ead3f4a13a2e8ad101b2.zip | |
Only override the target architecture on -m32 and friends if it is
actually different. Fixes a surprising link error with nodejs on rpi,
where armv6-netbsd-eabihf turned into armv5e-netbsd-eabihf, which
doesn't lacks the necessary VFP support.
llvm-svn: 217546
Diffstat (limited to 'clang/lib/Driver/Driver.cpp')
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index e2e6abceef0..647d2ca2b37 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -1947,7 +1947,7 @@ static llvm::Triple computeTargetTriple(StringRef DefaultTargetTriple, Target.setEnvironment(llvm::Triple::CODE16); } - if (AT != llvm::Triple::UnknownArch) + if (AT != llvm::Triple::UnknownArch && AT != Target.getArch()) Target.setArch(AT); } |
