diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Driver/Tools.cpp | 6 | ||||
| -rw-r--r-- | clang/test/Driver/linux-ld.c | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp index 7817f826150..37df7eea9b9 100644 --- a/clang/lib/Driver/Tools.cpp +++ b/clang/lib/Driver/Tools.cpp @@ -7189,9 +7189,9 @@ void gnutools::Link::ConstructJob(Compilation &C, const JobAction &JA, } AddRunTimeLibs(ToolChain, D, CmdArgs, Args); - if (!isAndroid && - (Args.hasArg(options::OPT_pthread) || - Args.hasArg(options::OPT_pthreads) || UsedOpenMPLib != LibUnknown)) + if ((Args.hasArg(options::OPT_pthread) || + Args.hasArg(options::OPT_pthreads) || UsedOpenMPLib != LibUnknown) && + !isAndroid) CmdArgs.push_back("-lpthread"); CmdArgs.push_back("-lc"); diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c index 019e7e92f77..c4a2e836b22 100644 --- a/clang/test/Driver/linux-ld.c +++ b/clang/test/Driver/linux-ld.c @@ -895,6 +895,12 @@ // RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD %s // CHECK-ANDROID-PTHREAD-NOT: -lpthread // +// RUN: %clang -no-canonical-prefixes %t.o -### -o %t 2>&1 \ +// RUN: --target=arm-linux-androideabi -pthread \ +// RUN: --sysroot=%S/Inputs/basic_android_tree/sysroot \ +// RUN: | FileCheck --check-prefix=CHECK-ANDROID-PTHREAD-LINK %s +// CHECK-ANDROID-PTHREAD-LINK-NOT: argument unused during compilation: '-pthread' +// // Check linker invocation on Debian 6 MIPS 32/64-bit. // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \ // RUN: --target=mipsel-linux-gnu \ |
