replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r191947. The problem is not MIPS-specific and requires more 

general solution.

llvm-svn: 191951
This commit is contained in:
Simon Atanasyan 2013-10-04 11:46:54 +00:00
parent 555a7727c1
commit eeb6f27fd5
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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)) {

10
clang/test/Driver/pic.c
View File

@ -209,13 +209,3 @@
// 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