diff options
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 237a244fb98..ba5dad5466f 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -3021,12 +3021,10 @@ ParsePICArgs(const ToolChain &ToolChain, const llvm::Triple &Triple, if (PIC && ToolChain.getTriple().isOSDarwin()) IsPICLevelTwo |= ToolChain.isPICDefault(); - // Note that these flags are trump-cards. Regardless of the order w.r.t. the - // PIC or PIE options above, if these show up, PIC is disabled. + // This kernel flags are a trump-card: they will disable PIC/PIE + // generation, independent of the argument order. if (KernelOrKext && (!Triple.isiOS() || Triple.isOSVersionLT(6))) PIC = PIE = false; - if (Args.hasArg(options::OPT_static)) - PIC = PIE = false; if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) { // This is a very special mode. It trumps the other modes, almost no one |
