[Driver] Automatically include C++ library dependencies

[phosek]

Summary

Existing drivers already include -lm as C++ library dependency, but
that alone is not sufficient when statically linking the C++ library.
To handle that case, we introduce a new method addCXXStdlibLinkDeps
which should automatically include all C++ library dependencies.

[dim]

I think this is the wrong direction, placing "common" code in addCXXStdlibLinkDeps, which then has all kinds of ugly ifs and switches for different OSes? Let different OSes handle this in their own way, maybe.

Until now I have not encountered an issue where I needed to add -lpthread to the link command line for a static C++ application; I think that is only needed when you actually use threading primitives? But still, I would rather see this in the OS-dependent handling functions.

[phosek]

In D54724#1303809, @dim wrote:

I think this is the wrong direction, placing "common" code in addCXXStdlibLinkDeps, which then has all kinds of ugly ifs and switches for different OSes? Let different OSes handle this in their own way, maybe.

You mean handling this in individual ToolChain subclasses? I've considered doing that. The reason I went with a single method is because we already use this approach for other types of runtimes like sanitizers, XRay, etc. There'd be still some duplication for handling different C++ libraries, but I'd be fine changing the implementation to use that approach if there's a strong preference for doing so.

Until now I have not encountered an issue where I needed to add -lpthread to the link command line for a static C++ application; I think that is only needed when you actually use threading primitives? But still, I would rather see this in the OS-dependent handling functions.

Have you been using libc++ or just libstdc++? libstdc++ is cheating a bit, because it relies on threading functions that are provided by libgcc (which in turn call into pthread), so -lpthread is not needed when using libstdc++, even when you link it statically. libc++ doesn't rely on these functions because it supports different builtin libraries (like compiler-rt) hence having to specify -lpthread explicitly.

[dim]

In D54724#1303844, @phosek wrote:

In D54724#1303809, @dim wrote:

I think this is the wrong direction, placing "common" code in addCXXStdlibLinkDeps, which then has all kinds of ugly ifs and switches for different OSes? Let different OSes handle this in their own way, maybe.

You mean handling this in individual ToolChain subclasses? I've considered doing that. The reason I went with a single method is because we already use this approach for other types of runtimes like sanitizers, XRay, etc. There'd be still some duplication for handling different C++ libraries, but I'd be fine changing the implementation to use that approach if there's a strong preference for doing so.

I think I understand the motivation, it's just that the toolchain classes were split up specifically to avoid if(OS==foo) ... else if(OS==bar) ... else if(OS==baz) mazes. So this feels a little like a regression in that sense, putting back the OS-specific ifs in a common function. But I guess it is a pattern that pops up more often.

Until now I have not encountered an issue where I needed to add -lpthread to the link command line for a static C++ application; I think that is only needed when you actually use threading primitives? But still, I would rather see this in the OS-dependent handling functions.

Have you been using libc++ or just libstdc++? libstdc++ is cheating a bit, because it relies on threading functions that are provided by libgcc (which in turn call into pthread), so -lpthread is not needed when using libstdc++, even when you link it statically. libc++ doesn't rely on these functions because it supports different builtin libraries (like compiler-rt) hence having to specify -lpthread explicitly.

We've been using libc++ by default since FreeBSD 10.x, and all older versions are now EOLed. That said, we have always used a linker script to link in libc++.so:

$ cat /usr/lib/libc++.so
/* $FreeBSD: projects/clang700-import/lib/libc++/libc++.ldscript 305102 2016-08-31 00:11:35Z bapt $ */
GROUP ( /usr/lib/libc++.so.1 /usr/lib/libcxxrt.so )

and for the static case, we've always just added the relevant .o files from libcxxrt into libc++.a:

$ ar tv /usr/lib/libc++.a
rw-r--r--       0/0         21720 Jan  1 01:00 1970 variant.o
rw-r--r--       0/0         61648 Jan  1 01:00 1970 valarray.o
rw-r--r--       0/0         18224 Jan  1 01:00 1970 utility.o
rw-r--r--       0/0         10656 Jan  1 01:00 1970 typeinfo.o
rw-r--r--       0/0        198080 Jan  1 01:00 1970 strstream.o
rw-r--r--       0/0         59264 Jan  1 01:00 1970 shared_mutex.o
rw-r--r--       0/0        231552 Jan  1 01:00 1970 regex.o
rw-r--r--       0/0         96200 Jan  1 01:00 1970 random.o
rw-r--r--       0/0         25240 Jan  1 01:00 1970 optional.o
rw-r--r--       0/0        239552 Jan  1 01:00 1970 iostream.o
rw-r--r--       0/0         17728 Jan  1 01:00 1970 functional.o
rw-r--r--       0/0        219984 Jan  1 01:00 1970 debug.o
rw-r--r--       0/0         58256 Jan  1 01:00 1970 chrono.o
rw-r--r--       0/0         35672 Jan  1 01:00 1970 charconv.o
rw-r--r--       0/0         21280 Jan  1 01:00 1970 bind.o
rw-r--r--       0/0         24312 Jan  1 01:00 1970 any.o
rw-r--r--       0/0       1010288 Jan  1 01:00 1970 algorithm.o
rw-r--r--       0/0         42944 Jan  1 01:00 1970 hash.o
rw-r--r--       0/0         45152 Jan  1 01:00 1970 cxxrt_typeinfo.o
rw-r--r--       0/0        278784 Jan  1 01:00 1970 cxxrt_libelftc_dem_gnu3.o
rw-r--r--       0/0         17704 Jan  1 01:00 1970 cxxrt_stdexcept.o
rw-r--r--       0/0        224664 Jan  1 01:00 1970 thread.o
rw-r--r--       0/0        218392 Jan  1 01:00 1970 future.o
rw-r--r--       0/0         31456 Jan  1 01:00 1970 exception.o
rw-r--r--       0/0       4604424 Jan  1 01:00 1970 locale.o
rw-r--r--       0/0         27216 Jan  1 01:00 1970 vector.o
rw-r--r--       0/0        102712 Jan  1 01:00 1970 mutex.o
rw-r--r--       0/0         63872 Jan  1 01:00 1970 memory.o
rw-r--r--       0/0       1261888 Jan  1 01:00 1970 ios.o
rw-r--r--       0/0         69528 Jan  1 01:00 1970 condition_variable.o
rw-r--r--       0/0        181368 Jan  1 01:00 1970 system_error.o
rw-r--r--       0/0       2006648 Jan  1 01:00 1970 string.o
rw-r--r--       0/0        105408 Jan  1 01:00 1970 stdexcept.o
rw-r--r--       0/0         37552 Jan  1 01:00 1970 new.o
rw-r--r--       0/0         10280 Jan  1 01:00 1970 cxxrt_memory.o
rw-r--r--       0/0          4880 Jan  1 01:00 1970 cxxrt_auxhelper.o
rw-r--r--       0/0          2872 Jan  1 01:00 1970 cxxrt_terminate.o
rw-r--r--       0/0        123504 Jan  1 01:00 1970 cxxrt_exception.o
rw-r--r--       0/0         18136 Jan  1 01:00 1970 cxxrt_dynamic_cast.o
rw-r--r--       0/0          5696 Jan  1 01:00 1970 cxxrt_guard.o

But I can link almost all C++ programs statically without having to add -lpthread. I guess you only really need it if you start using the multithreading primitives? I'm sort of hesitant to always add if, if it is not always needed. @emaste, what's your opinion on this?

[phosek]

In D54724#1304986, @dim wrote:

I think I understand the motivation, it's just that the toolchain classes were split up specifically to avoid if(OS==foo) ... else if(OS==bar) ... else if(OS==baz) mazes. So this feels a little like a regression in that sense, putting back the OS-specific ifs in a common function. But I guess it is a pattern that pops up more often.

I considered both options, the reason I went with conditionals is because we seem to use the same approach for other runtimes like compoler-rt builtins, sanitizers or XRay, but also because in this case there's likely going to be more duplication, e.g. the switch to handle either libstdc++ or libc++ would have to be duplicated in FreeBSD, NetBSD and OpenBSD drivers (unless we introduce a common base class for *BSD drivers). I could try implementing it the other way for comparison.

We've been using libc++ by default since FreeBSD 10.x, and all older versions are now EOLed. That said, we have always used a linker script to link in libc++.so:

$ cat /usr/lib/libc++.so
/* $FreeBSD: projects/clang700-import/lib/libc++/libc++.ldscript 305102 2016-08-31 00:11:35Z bapt $ */
GROUP ( /usr/lib/libc++.so.1 /usr/lib/libcxxrt.so )

I'm specifically focusing on static case, for shared case this is not relevant since libc++.so.1 already dynamically links all the dependencies.

and for the static case, we've always just added the relevant .o files from libcxxrt into libc++.a:

$ ar tv /usr/lib/libc++.a
rw-r--r--       0/0         21720 Jan  1 01:00 1970 variant.o
rw-r--r--       0/0         61648 Jan  1 01:00 1970 valarray.o
rw-r--r--       0/0         18224 Jan  1 01:00 1970 utility.o
rw-r--r--       0/0         10656 Jan  1 01:00 1970 typeinfo.o
rw-r--r--       0/0        198080 Jan  1 01:00 1970 strstream.o
rw-r--r--       0/0         59264 Jan  1 01:00 1970 shared_mutex.o
rw-r--r--       0/0        231552 Jan  1 01:00 1970 regex.o
rw-r--r--       0/0         96200 Jan  1 01:00 1970 random.o
rw-r--r--       0/0         25240 Jan  1 01:00 1970 optional.o
rw-r--r--       0/0        239552 Jan  1 01:00 1970 iostream.o
rw-r--r--       0/0         17728 Jan  1 01:00 1970 functional.o
rw-r--r--       0/0        219984 Jan  1 01:00 1970 debug.o
rw-r--r--       0/0         58256 Jan  1 01:00 1970 chrono.o
rw-r--r--       0/0         35672 Jan  1 01:00 1970 charconv.o
rw-r--r--       0/0         21280 Jan  1 01:00 1970 bind.o
rw-r--r--       0/0         24312 Jan  1 01:00 1970 any.o
rw-r--r--       0/0       1010288 Jan  1 01:00 1970 algorithm.o
rw-r--r--       0/0         42944 Jan  1 01:00 1970 hash.o
rw-r--r--       0/0         45152 Jan  1 01:00 1970 cxxrt_typeinfo.o
rw-r--r--       0/0        278784 Jan  1 01:00 1970 cxxrt_libelftc_dem_gnu3.o
rw-r--r--       0/0         17704 Jan  1 01:00 1970 cxxrt_stdexcept.o
rw-r--r--       0/0        224664 Jan  1 01:00 1970 thread.o
rw-r--r--       0/0        218392 Jan  1 01:00 1970 future.o
rw-r--r--       0/0         31456 Jan  1 01:00 1970 exception.o
rw-r--r--       0/0       4604424 Jan  1 01:00 1970 locale.o
rw-r--r--       0/0         27216 Jan  1 01:00 1970 vector.o
rw-r--r--       0/0        102712 Jan  1 01:00 1970 mutex.o
rw-r--r--       0/0         63872 Jan  1 01:00 1970 memory.o
rw-r--r--       0/0       1261888 Jan  1 01:00 1970 ios.o
rw-r--r--       0/0         69528 Jan  1 01:00 1970 condition_variable.o
rw-r--r--       0/0        181368 Jan  1 01:00 1970 system_error.o
rw-r--r--       0/0       2006648 Jan  1 01:00 1970 string.o
rw-r--r--       0/0        105408 Jan  1 01:00 1970 stdexcept.o
rw-r--r--       0/0         37552 Jan  1 01:00 1970 new.o
rw-r--r--       0/0         10280 Jan  1 01:00 1970 cxxrt_memory.o
rw-r--r--       0/0          4880 Jan  1 01:00 1970 cxxrt_auxhelper.o
rw-r--r--       0/0          2872 Jan  1 01:00 1970 cxxrt_terminate.o
rw-r--r--       0/0        123504 Jan  1 01:00 1970 cxxrt_exception.o
rw-r--r--       0/0         18136 Jan  1 01:00 1970 cxxrt_dynamic_cast.o
rw-r--r--       0/0          5696 Jan  1 01:00 1970 cxxrt_guard.o

We use that solution for libc++abi as well but that doesn't handle other dependencies.

But I can link almost all C++ programs statically without having to add -lpthread. I guess you only really need it if you start using the multithreading primitives? I'm sort of hesitant to always add if, if it is not always needed. @emaste, what's your opinion on this?

Correct, on other platforms you also need -ldl, but on *BSD this is part of libc AFAIK. We could also consider surrounding these dependencies with --push-state --as-needed and --pop-state to avoid linking them in if they're not needed.

clang/lib/Driver/ToolChains/CommonArgs.h

unsigned ParseFunctionAlignment(const ToolChain &TC,
                                 const llvm::opt::ArgList &Args);
 
 void AddAssemblerKPIC(const ToolChain &ToolChain,
                       const llvm::opt::ArgList &Args,
                       llvm::opt::ArgStringList &CmdArgs);
 
 void addArchSpecificRPath(const ToolChain &TC, const llvm::opt::ArgList &Args,
                           llvm::opt::ArgStringList &CmdArgs);
+
+void addCXXStdlibLinkDeps(const ToolChain &ToolChain,
+                          const llvm::opt::ArgList &Args,
+                          llvm::opt::ArgStringList &CmdArgs);
+
 /// Returns true, if an OpenMP runtime has been added.
 bool addOpenMPRuntime(llvm::opt::ArgStringList &CmdArgs, const ToolChain &TC,
                       const llvm::opt::ArgList &Args,
                       bool IsOffloadingHost = false, bool GompNeedsRT = false);
 
 llvm::opt::Arg *getLastProfileUseArg(const llvm::opt::ArgList &Args);
 llvm::opt::Arg *getLastProfileSampleUseArg(const llvm::opt::ArgList &Args);
 

clang/lib/Driver/ToolChains/CommonArgs.cpp

if (TC.getTriple().isKnownWindowsMSVCEnvironment()) {
             << Args.getLastArg(options::OPT_rtlib_EQ)->getValue() << "MSVC";
       }
     } else
       AddLibgcc(TC.getTriple(), D, CmdArgs, Args);
     break;
   }
 }
 
+void tools::addCXXStdlibLinkDeps(const ToolChain &ToolChain,
+                                 const ArgList &Args,
+                                 ArgStringList &CmdArgs) {
+  const llvm::Triple &Triple = ToolChain.getTriple();
+
+  bool StaticLibstdcxx = Args.hasArg(options::OPT_static_libstdcxx) &&
+                         !Args.hasArg(options::OPT_static);
+
+  // TODO: should this be only included when -static-libstdc++ is used?
+  if ((Triple.getOS() == llvm::Triple::FreeBSD ||
+       Triple.getOS() == llvm::Triple::OpenBSD ||
+       Triple.isPS4CPU()) && Args.hasArg(options::OPT_pg))
+    CmdArgs.push_back("-lm_p");
+  else
+    CmdArgs.push_back("-lm");
+
+  if (StaticLibstdcxx) {
+    if (!Triple.isAndroid())
+      CmdArgs.push_back("-lpthread");
+
+    switch (ToolChain.GetCXXStdlibType(Args)) {
+    case ToolChain::CST_Libcxx:
+      if (Triple.getOS() != llvm::Triple::FreeBSD &&
+          Triple.getOS() != llvm::Triple::NetBSD &&
+          Triple.getOS() != llvm::Triple::OpenBSD)
+        CmdArgs.push_back("-ldl");
+      break;
+
+    case ToolChain::CST_Libstdcxx:
+      switch (ToolChain.GetRuntimeLibType(Args)) {
+      case ToolChain::RLT_CompilerRT:
+        AddLibgcc(Triple, ToolChain.getDriver(), CmdArgs, Args);
+        break;
+      case ToolChain::RLT_Libgcc:
+        // libgcc will be added by AddLibgcc.
+        break;
+      }
+      break;
+    }
+  }
+}
+
 /// Add OpenMP linker script arguments at the end of the argument list so that
 /// the fat binary is built by embedding each of the device images into the
 /// host. The linker script also defines a few symbols required by the code
 /// generation so that the images can be easily retrieved at runtime by the
 /// offloading library. This should be used only in tool chains that support
 /// linker scripts.
 void tools::AddOpenMPLinkerScript(const ToolChain &TC, Compilation &C,
                                   const InputInfo &Output,

clang/lib/Driver/ToolChains/DragonFly.cpp

if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     if (!Args.hasArg(options::OPT_static)) {
       CmdArgs.push_back("-rpath");
       CmdArgs.push_back("/usr/lib/gcc50");
     }
 
     if (D.CCCIsCXX()) {
       if (getToolChain().ShouldLinkCXXStdlib(Args))
         getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
-      CmdArgs.push_back("-lm");
+      addCXXStdlibLinkDeps(getToolChain(), Args, CmdArgs);
     }
 
     if (Args.hasArg(options::OPT_pthread))
       CmdArgs.push_back("-lpthread");
 
     if (!Args.hasArg(options::OPT_nolibc)) {
       CmdArgs.push_back("-lc");
     }

clang/lib/Driver/ToolChains/FreeBSD.cpp

void freebsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     addOpenMPRuntime(CmdArgs, ToolChain, Args);
     if (D.CCCIsCXX()) {
       if (ToolChain.ShouldLinkCXXStdlib(Args))
         ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-      if (Args.hasArg(options::OPT_pg))
-        CmdArgs.push_back("-lm_p");
-      else
-        CmdArgs.push_back("-lm");
+      addCXXStdlibLinkDeps(ToolChain, Args, CmdArgs);
     }
     if (NeedsSanitizerDeps)
       linkSanitizerRuntimeDeps(ToolChain, CmdArgs);
     if (NeedsXRayDeps)
       linkXRayRuntimeDeps(ToolChain, CmdArgs);
     // FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding
     // the default system libraries. Just mimic this for now.
     if (Args.hasArg(options::OPT_pg))

clang/lib/Driver/ToolChains/Fuchsia.cpp

if (D.CCCIsCXX()) {
                                    !Args.hasArg(options::OPT_static);
         CmdArgs.push_back("--push-state");
         CmdArgs.push_back("--as-needed");
         if (OnlyLibstdcxxStatic)
           CmdArgs.push_back("-Bstatic");
         ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
         if (OnlyLibstdcxxStatic)
           CmdArgs.push_back("-Bdynamic");
-        CmdArgs.push_back("-lm");
+        addCXXStdlibLinkDeps(ToolChain, Args, CmdArgs);
         CmdArgs.push_back("--pop-state");
       }
     }
 
     AddRunTimeLibs(ToolChain, D, CmdArgs, Args);
 
     if (Args.hasArg(options::OPT_pthread) ||
         Args.hasArg(options::OPT_pthreads))

clang/lib/Driver/ToolChains/Gnu.cpp

if (D.CCCIsCXX() &&
     if (ToolChain.ShouldLinkCXXStdlib(Args)) {
       bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
                                  !Args.hasArg(options::OPT_static);
       if (OnlyLibstdcxxStatic)
         CmdArgs.push_back("-Bstatic");
       ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
       if (OnlyLibstdcxxStatic)
         CmdArgs.push_back("-Bdynamic");
+      addCXXStdlibLinkDeps(ToolChain, Args, CmdArgs);
     }
     CmdArgs.push_back("-lm");
   }
   // Silence warnings when linking C code with a C++ '-stdlib' argument.
   Args.ClaimAllArgs(options::OPT_stdlib_EQ);
 
   if (!Args.hasArg(options::OPT_nostdlib)) {
     if (!Args.hasArg(options::OPT_nodefaultlibs)) {

clang/lib/Driver/ToolChains/Hexagon.cpp

constructHexagonLinkArgs(Compilation &C, const JobAction &JA,
 
   //----------------------------------------------------------------------------
   // Libraries
   //----------------------------------------------------------------------------
   if (IncStdLib && IncDefLibs) {
     if (D.CCCIsCXX()) {
       if (HTC.ShouldLinkCXXStdlib(Args))
         HTC.AddCXXStdlibLibArgs(Args, CmdArgs);
-      CmdArgs.push_back("-lm");
+      addCXXStdlibLinkDeps(HTC, Args, CmdArgs);
     }
 
     CmdArgs.push_back("--start-group");
 
     if (!IsShared) {
       for (StringRef Lib : OsLibs)
         CmdArgs.push_back(Args.MakeArgString("-l" + Lib));
       CmdArgs.push_back("-lc");

clang/lib/Driver/ToolChains/OpenBSD.cpp

void openbsd::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
   bool NeedsXRayDeps = addXRayRuntime(ToolChain, Args, CmdArgs);
   AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     if (D.CCCIsCXX()) {
       if (ToolChain.ShouldLinkCXXStdlib(Args))
         ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-      if (Args.hasArg(options::OPT_pg))
-        CmdArgs.push_back("-lm_p");
-      else
-        CmdArgs.push_back("-lm");
+      addCXXStdlibLinkDeps(ToolChain, Args, CmdArgs);
     }
     if (NeedsSanitizerDeps) {
       CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins", false));
       linkSanitizerRuntimeDeps(ToolChain, CmdArgs);
     }
     if (NeedsXRayDeps) {
       CmdArgs.push_back(ToolChain.getCompilerRTArgString(Args, "builtins", false));
       linkXRayRuntimeDeps(ToolChain, CmdArgs);

clang/lib/Driver/ToolChains/PS4CPU.cpp

 #include "clang/Driver/Options.h"
 #include "clang/Driver/SanitizerArgs.h"
 #include "llvm/Option/ArgList.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/Path.h"
 #include <cstdlib> // ::getenv
 
 using namespace clang::driver;
+using namespace clang::driver::tools;
 using namespace clang;
 using namespace llvm::opt;
 
 using clang::driver::tools::AddLinkerInputs;
 
 void tools::PS4cpu::addProfileRTArgs(const ToolChain &TC, const ArgList &Args,
                                      ArgStringList &CmdArgs) {
   if ((Args.hasFlag(options::OPT_fprofile_arcs, options::OPT_fno_profile_arcs,
static void ConstructGoldLinkJob(const Tool &T, Compilation &C,
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
     // For PS4, we always want to pass libm, libstdc++ and libkernel
     // libraries for both C and C++ compilations.
     CmdArgs.push_back("-lkernel");
     if (D.CCCIsCXX()) {
       if (ToolChain.ShouldLinkCXXStdlib(Args))
         ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-      if (Args.hasArg(options::OPT_pg))
-        CmdArgs.push_back("-lm_p");
-      else
-        CmdArgs.push_back("-lm");
+      addCXXStdlibLinkDeps(ToolChain, Args, CmdArgs);
     }
     // FIXME: For some reason GCC passes -lgcc and -lgcc_s before adding
     // the default system libraries. Just mimic this for now.
     if (Args.hasArg(options::OPT_pg))
       CmdArgs.push_back("-lgcc_p");
     else
       CmdArgs.push_back("-lcompiler_rt");
     if (Args.hasArg(options::OPT_static)) {

clang/test/Driver/fuchsia.cpp

 // RUN:     -fuse-ld=lld 2>&1 \
 // RUN:     | FileCheck %s -check-prefix=CHECK-STATIC
 // CHECK-STATIC: "--push-state"
 // CHECK-STATIC: "--as-needed"
 // CHECK-STATIC: "-Bstatic"
 // CHECK-STATIC: "-lc++"
 // CHECK-STATIC: "-Bdynamic"
 // CHECK-STATIC: "-lm"
+// CHECK-STATIC: "-lpthread"
+// CHECK-STATIC: "-ldl"
 // CHECK-STATIC: "--pop-state"
 // CHECK-STATIC: "-lc"

clang/test/Driver/linux-ld.c

 // CHECK-BASIC-LIBCXX-C-LINK-NOT: warning:
 // CHECK-BASIC-LIBCXX-C-LINK: "{{[^"]*}}clang{{[^"]*}}" "-cc1"
 // CHECK-BASIC-LIBCXX-C-LINK: "-isysroot" "[[SYSROOT:[^"]+]]"
 // CHECK-BASIC-LIBCXX-C-LINK-NOT: "-internal-isystem" "[[SYSROOT]]/usr/bin/../include/c++/v1"
 // CHECK-BASIC-LIBCXX-C-LINK: "-internal-isystem" "[[SYSROOT]]/usr/local/include"
 // CHECK-BASIC-LIBCXX-C-LINK: "--sysroot=[[SYSROOT]]"
 // CHECK-BASIC-LIBCXX-C-LINK: "-L[[SYSROOT]]/usr/bin/../lib"
 //
+// Test that we include necessary dependencies when statically linking libc++.
+// RUN: %clangxx -no-canonical-prefixes -x c++ %s -### -o %t.o 2>&1 \
+// RUN:     -target x86_64-unknown-linux-gnu \
+// RUN:     -stdlib=libc++ \
+// RUN:     -static-libstdc++ \
+// RUN:     -ccc-install-dir %S/Inputs/basic_linux_tree/usr/bin \
+// RUN:     --gcc-toolchain="" \
+// RUN:     --sysroot=%S/Inputs/basic_linux_libcxx_tree \
+// RUN:   | FileCheck --check-prefix=CHECK-BASIC-LIBCXX-STATIC %s
+// CHECK-BASIC-LIBCXX-STATIC: "-Bstatic"
+// CHECK-BASIC-LIBCXX-STATIC: "-lc++"
+// CHECK-BASIC-LIBCXX-STATIC: "-Bdynamic"
+// CHECK-BASIC-LIBCXX-STATIC: "-lpthread"
+// CHECK-BASIC-LIBCXX-STATIC: "-ldl"
+// CHECK-BASIC-LIBCXX-STATIC: "-lm"
+//
 // Test a very broken version of multiarch that shipped in Ubuntu 11.04.
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
 // RUN:     --target=i386-unknown-linux \
 // RUN:     --gcc-toolchain="" \
 // RUN:     --sysroot=%S/Inputs/ubuntu_11.04_multiarch_tree \
 // RUN:   | FileCheck --check-prefix=CHECK-UBUNTU-11-04 %s
 // CHECK-UBUNTU-11-04: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
 // CHECK-UBUNTU-11-04: "{{.*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5{{/|\\\\}}crtbegin.o"