From c84a5329f6ca3137a3e4e1259f4d9cf1e985d191 Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 5 Jun 2014 11:41:39 +0000 Subject: [PATCH] Fix driver warning about -pthread on Android. -pthread is no-op on Android. Suppress the unused argument warning. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@210253 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Driver/Tools.cpp | 6 +++--- test/Driver/linux-ld.c | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 7817f82615..37df7eea9b 100644 --- a/lib/Driver/Tools.cpp +++ b/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/test/Driver/linux-ld.c b/test/Driver/linux-ld.c index 019e7e92f7..c4a2e836b2 100644 --- a/test/Driver/linux-ld.c +++ b/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 \ -- 2.50.1