[libcxx-commits] [libcxx] r362048 - [runtimes] Support ELF dependent libraries feature
Petr Hosek via libcxx-commits
libcxx-commits at lists.llvm.org
Wed May 29 18:34:41 PDT 2019
Author: phosek
Date: Wed May 29 18:34:41 2019
New Revision: 362048
URL: http://llvm.org/viewvc/llvm-project?rev=362048&view=rev
Log:
[runtimes] Support ELF dependent libraries feature
As of r360984, LLD supports dependent libraries feature for ELF.
libunwind, libc++abi and libc++ have library dependencies: libdl librt
and libpthread, which means that when libunwind and libc++ are being
statically linked (using -static-libstdc++ flag), user has to manually
specify -ldl -lpthread which is onerous.
This change includes the lib pragma to specify the library dependencies
directly in the source that uses those libraries. This doesn't make any
difference when using linkers that don't support dependent libraries.
However, when using LLD that has dependent libraries feature, users no
longer have to manually specifying library dependencies when using
static linking, linker will pick the library automatically.
Differential Revision: https://reviews.llvm.org/D62090
Modified:
libcxx/trunk/src/algorithm.cpp
libcxx/trunk/src/chrono.cpp
libcxx/trunk/src/condition_variable.cpp
libcxx/trunk/src/debug.cpp
libcxx/trunk/src/experimental/memory_resource.cpp
libcxx/trunk/src/filesystem/operations.cpp
libcxx/trunk/src/memory.cpp
libcxx/trunk/src/mutex.cpp
libcxx/trunk/src/shared_mutex.cpp
libcxx/trunk/src/thread.cpp
Modified: libcxx/trunk/src/algorithm.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/algorithm.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/algorithm.cpp (original)
+++ libcxx/trunk/src/algorithm.cpp Wed May 29 18:34:41 2019
@@ -8,7 +8,12 @@
#include "algorithm"
#include "random"
+#ifndef _LIBCPP_HAS_NO_THREADS
#include "mutex"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
+#endif
_LIBCPP_BEGIN_NAMESPACE_STD
Modified: libcxx/trunk/src/chrono.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/chrono.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/chrono.cpp (original)
+++ libcxx/trunk/src/chrono.cpp Wed May 29 18:34:41 2019
@@ -37,6 +37,10 @@
#endif
#endif
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "rt")
+#endif
+
_LIBCPP_BEGIN_NAMESPACE_STD
namespace chrono
Modified: libcxx/trunk/src/condition_variable.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/condition_variable.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/condition_variable.cpp (original)
+++ libcxx/trunk/src/condition_variable.cpp Wed May 29 18:34:41 2019
@@ -15,6 +15,10 @@
#include "system_error"
#include "__undef_macros"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
+
_LIBCPP_BEGIN_NAMESPACE_STD
condition_variable::~condition_variable()
Modified: libcxx/trunk/src/debug.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/debug.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/debug.cpp (original)
+++ libcxx/trunk/src/debug.cpp Wed May 29 18:34:41 2019
@@ -13,7 +13,12 @@
#include "string"
#include "cstdio"
#include "__hash_table"
+#ifndef _LIBCPP_HAS_NO_THREADS
#include "mutex"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
+#endif
_LIBCPP_BEGIN_NAMESPACE_STD
Modified: libcxx/trunk/src/experimental/memory_resource.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/experimental/memory_resource.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/experimental/memory_resource.cpp (original)
+++ libcxx/trunk/src/experimental/memory_resource.cpp Wed May 29 18:34:41 2019
@@ -12,6 +12,9 @@
#include "atomic"
#elif !defined(_LIBCPP_HAS_NO_THREADS)
#include "mutex"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
#endif
_LIBCPP_BEGIN_NAMESPACE_LFTS_PMR
Modified: libcxx/trunk/src/filesystem/operations.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/filesystem/operations.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/filesystem/operations.cpp (original)
+++ libcxx/trunk/src/filesystem/operations.cpp Wed May 29 18:34:41 2019
@@ -44,6 +44,10 @@
#include <sys/time.h> // for gettimeofday and timeval
#endif // !defined(CLOCK_REALTIME)
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "rt")
+#endif
+
#if defined(_LIBCPP_COMPILER_GCC)
#if _GNUC_VER < 500
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
Modified: libcxx/trunk/src/memory.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/memory.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/memory.cpp (original)
+++ libcxx/trunk/src/memory.cpp Wed May 29 18:34:41 2019
@@ -10,6 +10,9 @@
#ifndef _LIBCPP_HAS_NO_THREADS
#include "mutex"
#include "thread"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
#endif
#include "include/atomic_support.h"
Modified: libcxx/trunk/src/mutex.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/mutex.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/mutex.cpp (original)
+++ libcxx/trunk/src/mutex.cpp Wed May 29 18:34:41 2019
@@ -12,6 +12,12 @@
#include "include/atomic_support.h"
#include "__undef_macros"
+#ifndef _LIBCPP_HAS_NO_THREADS
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
+#endif
+
_LIBCPP_BEGIN_NAMESPACE_STD
#ifndef _LIBCPP_HAS_NO_THREADS
Modified: libcxx/trunk/src/shared_mutex.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/shared_mutex.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/shared_mutex.cpp (original)
+++ libcxx/trunk/src/shared_mutex.cpp Wed May 29 18:34:41 2019
@@ -10,6 +10,9 @@
#ifndef _LIBCPP_HAS_NO_THREADS
#include "shared_mutex"
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
_LIBCPP_BEGIN_NAMESPACE_STD
Modified: libcxx/trunk/src/thread.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/thread.cpp?rev=362048&r1=362047&r2=362048&view=diff
==============================================================================
--- libcxx/trunk/src/thread.cpp (original)
+++ libcxx/trunk/src/thread.cpp Wed May 29 18:34:41 2019
@@ -35,6 +35,10 @@
#include <windows.h>
#endif
+#if defined(__unix__) && defined(__ELF__) && defined(__clang__)
+#pragma comment(lib, "pthread")
+#endif
+
_LIBCPP_BEGIN_NAMESPACE_STD
thread::~thread()
More information about the libcxx-commits
mailing list