On 22/11/20 22:41 +0100, Stephan Bergmann wrote:
On 20/11/2020 23:44, Thomas Rodgers wrote:
Tested x86_64-pc-linux-gnu, committed.
...and there are multiple definition complaints from the linker
because of two missing "include":
index 7b2682a577e..23ab2018ca8 100644
--- a/libstdc++-v3/include/bits/atomic_wait.h
+++ b/libstdc++-v3/include/bits/atomic_wait.h
@@ -223,7 +223,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ _M_w._M_do_wait(_M_version); }
};
- void
+ inline void
__thread_relax() noexcept
{
#if defined __i386__ || defined __x86_64__
@@ -233,7 +233,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
}
- void
+ inline void
__thread_yield() noexcept
{
#if defined _GLIBCXX_USE_SCHED_YIELD
Committed, thanks.
commit 0986d3bc621b12c3d0367bf7bd25927c7fbfc552
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Mon Nov 23 18:14:44 2020
libstdc++: Fix linker errors due to missing 'inline' keywords
libstdc++-v3/ChangeLog:
* include/bits/atomic_wait.h (__thread_relax, __thread_yield):
Add 'inline'.
diff --git a/libstdc++-v3/include/bits/atomic_wait.h b/libstdc++-v3/include/bits/atomic_wait.h
index a40cff124d7d..cd756f68de6d 100644
--- a/libstdc++-v3/include/bits/atomic_wait.h
+++ b/libstdc++-v3/include/bits/atomic_wait.h
@@ -224,7 +224,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ _M_w._M_do_wait(_M_version); }
};
- void
+ inline void
__thread_relax() noexcept
{
#if defined __i386__ || defined __x86_64__
@@ -234,9 +234,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#endif
}
- void
+ inline void
__thread_yield() noexcept
- {
+ {
#if defined _GLIBCXX_USE_SCHED_YIELD
__gthread_yield();
#endif
