summaryrefslogtreecommitdiffstats
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorSimon Atanasyan <simon@atanasyan.com>2013-10-04 11:46:54 +0000
committerSimon Atanasyan <simon@atanasyan.com>2013-10-04 11:46:54 +0000
commiteeb6f27fd52611d3c97eee5a4dad668b08e9a8f9 (patch)
treeee1921848f99d5de54d9dc6d943e061259b2736b /clang/lib/Driver/Tools.cpp
parent555a7727c130a4b8e56880a43d0cccb74d5d0551 (diff)
downloadbcm5719-llvm-eeb6f27fd52611d3c97eee5a4dad668b08e9a8f9.tar.gz
bcm5719-llvm-eeb6f27fd52611d3c97eee5a4dad668b08e9a8f9.zip
Revert r191947. The problem is not MIPS-specific and requires more
general solution. llvm-svn: 191951
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index d2ca9fb8df1..2f824cbcad7 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -2139,13 +2139,7 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
if (KernelOrKext &&
(!Triple.isiOS() || Triple.isOSVersionLT(6)))
PIC = PIE = false;
- // Usually '-static' implies no-PIC. But for MIPS '-fPIC -static' means
- // to compile as -fPIC but link with -static.
- if (Args.hasArg(options::OPT_static) &&
- getToolChain().getArch() != llvm::Triple::mips &&
- getToolChain().getArch() != llvm::Triple::mipsel &&
- getToolChain().getArch() != llvm::Triple::mips64 &&
- getToolChain().getArch() != llvm::Triple::mips64el)
+ if (Args.hasArg(options::OPT_static))
PIC = PIE = false;
if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {
OpenPOWER on IntegriCloud