OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

Driver: use the triple to query the arch, not the toolchain 

Although the result is the same, the intent is much more clear this way:
we care about the architecture we are targeting.  NFC.

llvm-svn: 290305
This commit is contained in:
Saleem Abdulrasool 2016-12-22 03:09:04 +00:00
parent 491d1d4b00
commit 2511d6049e
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3805,7 +3805,7 @@ ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) {
// Android-specific defaults for PIC/PIE // Android-specific defaults for PIC/PIE
if (Triple.isAndroid()) { if (Triple.isAndroid()) {
switch (ToolChain.getArch()) { switch (Triple.getArch()) {
case llvm::Triple::arm: case llvm::Triple::arm:
case llvm::Triple::armeb: case llvm::Triple::armeb:
case llvm::Triple::thumb: case llvm::Triple::thumb:
@ -3917,7 +3917,7 @@ ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) {
} }
bool EmbeddedPISupported; bool EmbeddedPISupported;
switch (ToolChain.getArch()) { switch (Triple.getArch()) {
case llvm::Triple::arm: case llvm::Triple::arm:
case llvm::Triple::armeb: case llvm::Triple::armeb:
case llvm::Triple::thumb: case llvm::Triple::thumb:
@ -3946,9 +3946,8 @@ ParsePICArgs(const ToolChain &ToolChain, const ArgList &Args) {
} }
// ROPI and RWPI are not comaptible with PIC or PIE. // ROPI and RWPI are not comaptible with PIC or PIE.
if ((ROPI || RWPI) && (PIC || PIE)) { if ((ROPI || RWPI) && (PIC || PIE))
ToolChain.getDriver().Diag(diag::err_drv_ropi_rwpi_incompatible_with_pic); ToolChain.getDriver().Diag(diag::err_drv_ropi_rwpi_incompatible_with_pic);
}
if (PIC) if (PIC)
return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2U : 1U, PIE); return std::make_tuple(llvm::Reloc::PIC_, IsPICLevelTwo ? 2U : 1U, PIE);