Include -lpthread on the link line automatically only for C++

test/Driver/nacl-direct.c

Index: test/Driver/nacl-direct.c
diff --git a/test/Driver/nacl-direct.c b/test/Driver/nacl-direct.c
index 080fe3c4d55a4ebaf626fbfc909101e18fa1fb00..76f9eff1ca421a0d7c9664474c6a5a267a165a7e 100644
--- a/test/Driver/nacl-direct.c
+++ b/test/Driver/nacl-direct.c
@@ -19,6 +19,7 @@
 // CHECK-I686: "-L{{.*}}/../x86_64-nacl/lib32"
 // CHECK-I686: "-L{{.*}}/../x86_64-nacl/usr/lib32"
 // CHECK-I686: "-L{{.*}}/../lib/clang/[[VER]]/lib/i686-nacl"
+// CHECK-I686-NOT: -lpthread
 //
 // RUN: %clang -### -o %t.o %s 2>&1 \
 // RUN:     -target x86_64-unknown-nacl \
@@ -38,6 +39,7 @@
 // CHECK-x86_64: "-L{{.*}}/../x86_64-nacl/lib"
 // CHECK-x86_64: "-L{{.*}}/../x86_64-nacl/usr/lib"
 // CHECK-x86_64: "-L{{.*}}/../lib/clang/[[VER]]/lib/x86_64-nacl"
+// CHECK-X86_64-NOT: -lpthread
 //
 // RUN: %clang -### -o %t.o %s 2>&1 \
 // RUN:     -target armv7a-unknown-nacl-gnueabihf \
@@ -59,6 +61,7 @@
 // CHECK-ARM: "-L{{.*}}/../arm-nacl/lib"
 // CHECK-ARM: "-L{{.*}}/../arm-nacl/usr/lib"
 // CHECK-ARM: "-L{{.*}}/../lib/clang/[[VER]]/lib/arm-nacl"
+// CHECK-ARM-NOT: -lpthread
 
 // Check that even when the target arch is just "arm" (as will be the case when
 // it is inferred from the binary name) that we get the right ABI flags
@@ -69,9 +72,9 @@
 // CHECK-ARM-NOV7: "-target-abi" "aapcs-linux"
 // CHECK-ARM-NOV7: "-mfloat-abi" "hard"
 
-// Check C++ include directories
+// Test clang c++ include dirs and link line when using clang++
 
-// RUN: %clang -x c++ -### -o %t.o %s 2>&1 \
+// RUN: %clangxx -### -o %t.o %s 2>&1 \
 // RUN:     -target armv7a-unknown-nacl-gnueabihf \
 // RUN:   | FileCheck --check-prefix=CHECK-ARM-CXX %s
 // CHECK-ARM-CXX: {{.*}}clang{{.*}}" "-cc1"
@@ -82,7 +85,7 @@
 // CHECK-ARM-CXX: "-internal-isystem" "{{.*}}/../arm-nacl/include"
 // CHECK-ARM-CXX: "-lpthread"
 
-// RUN: %clang -x c++ -### -o %t.o %s 2>&1 \
+// RUN: %clangxx -### -o %t.o %s 2>&1 \
 // RUN:     -target i686-unknown-nacl \
 // RUN:   | FileCheck --check-prefix=CHECK-I686-CXX %s
 // CHECK-I686-CXX: {{.*}}clang{{.*}}" "-cc1"
@@ -93,8 +96,7 @@
 // CHECK-I686-CXX: "-internal-isystem" "{{.*}}/../x86_64-nacl/include"
 // CHECK-I686-CXX: "-lpthread"
 
-//
-// RUN: %clang -x c++ -### -o %t.o %s 2>&1 \
+// RUN: %clangxx -### -o %t.o %s 2>&1 \
 // RUN:     -target x86_64-unknown-nacl \
 // RUN:   | FileCheck --check-prefix=CHECK-x86_64-CXX %s
 // CHECK-x86_64-CXX: {{.*}}clang{{.*}}" "-cc1"