[Mips] For MIPS '-fPIC -static' means to compile as -fPIC but link with

-static. So do not turn off the PIC flag if -static passed to the
driver in case of MIPS target.

http://llvm.org/bugs/show_bug.cgi?id=14693

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@191947 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 2f824cbcad77a99244819de016c78336a79e83e7..d2ca9fb8df13918a767578ed8aad1bc3bae6688e 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -2139,7 +2139,13 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
   if (KernelOrKext &&
       (!Triple.isiOS() || Triple.isOSVersionLT(6)))
     PIC = PIE = false;
-  if (Args.hasArg(options::OPT_static))
+  // 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)
     PIC = PIE = false;
 
   if (Arg *A = Args.getLastArg(options::OPT_mdynamic_no_pic)) {

diff --git a/test/Driver/pic.c b/test/Driver/pic.c
index 30e1005c97370d679213db64c3797968831db03d..7bf514caa30ff9d1e3899ea5facdc81b2e1f9245 100644 (file)
--- a/test/Driver/pic.c
+++ b/test/Driver/pic.c
@@ -209,3 +209,13 @@
 // On OpenBSD, -nopie needs to be passed through to the linker.
 // RUN: %clang %s -target i386-pc-openbsd -nopie -### 2>&1 \
 // RUN:   | FileCheck %s --check-prefix=CHECK-NOPIE-LD
+//
+// For MIPS -fPIC -static means to compile as -fPIC but link with -static.
+// RUN: %clang -c %s -target mips-linux-gnu -fpic -static -### 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-PIC1
+// RUN: %clang -c %s -target mips-linux-gnu -### 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-NO-PIC
+// RUN: %clang -c %s -target mips-linux-gnu -fpic -### 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-PIC1
+// RUN: %clang -c %s -target mips-linux-gnu -static -### 2>&1 \
+// RUN:   | FileCheck %s --check-prefix=CHECK-NO-PIC