From: Jonathan Wakely <jwakely@redhat.com>
To: Stephan Bergmann <sbergman@redhat.com>
Cc: Thomas Rodgers <rodgert@appliantology.com>,
trodgers@redhat.com, libstdc++@gcc.gnu.org,
gcc-patches List <gcc-patches@gcc.gnu.org>
Subject: Re: [PATCH] libstdc++: Add C++2a synchronization support
Date: Mon, 23 Nov 2020 18:32:06 +0000 [thread overview]
Message-ID: <20201123183206.GZ1312820@redhat.com> (raw)
In-Reply-To: <16260c13-75dd-c34e-fc30-25d88e184e58@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 809 bytes --]
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.
[-- Attachment #2: patch.txt --]
[-- Type: text/x-patch, Size: 986 bytes --]
commit 0986d3bc621b12c3d0367bf7bd25927c7fbfc552
Author: Stephan Bergmann <sbergman@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
next prev parent reply other threads:[~2020-11-23 18:32 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-10 0:01 [PATCH] " Thomas Rodgers
2020-05-11 14:05 ` Jonathan Wakely
2020-05-11 15:43 ` Thomas Rodgers
2020-05-11 17:05 ` Jonathan Wakely
2020-05-11 20:59 ` Thomas Rodgers
2020-05-23 22:52 ` Thomas Rodgers
2020-05-24 17:41 ` Thomas Rodgers
2020-06-06 0:29 ` Thomas Rodgers
2020-07-08 16:43 ` Jonathan Wakely
2020-08-03 14:09 ` Jonathan Wakely
2020-08-03 20:19 ` Jonathan Wakely
2020-09-03 0:47 ` Thomas Rodgers
2020-09-03 0:54 ` Thomas Rodgers
2020-09-11 23:58 ` [PATCH] libstdc++: " Thomas Rodgers
2020-09-28 13:25 ` Jonathan Wakely
2020-10-01 23:37 ` Thomas Rodgers
2020-10-02 15:40 ` Thomas Rodgers
2020-10-05 22:54 ` [PATCH] t/trodgers/c2a_synchronization Thomas Rodgers
2020-10-23 10:28 ` Jonathan Wakely
2020-10-26 21:48 ` [PATCH] libstdc++: Add C++2a synchronization support Thomas Rodgers
2020-10-27 10:23 ` Jonathan Wakely
2020-11-20 22:44 ` Thomas Rodgers
2020-11-22 21:13 ` Stephan Bergmann
2020-11-23 18:33 ` Jonathan Wakely
2020-11-22 21:41 ` Stephan Bergmann
2020-11-23 18:32 ` Jonathan Wakely [this message]
2020-11-21 15:16 ` Andreas Schwab
2020-11-21 17:04 ` Jonathan Wakely
2020-11-21 17:39 ` Jonathan Wakely
2020-11-22 0:36 ` H.J. Lu
2020-11-23 14:50 ` Jonathan Wakely
2020-11-24 23:45 ` Jonathan Wakely
2020-11-25 1:07 ` Jonathan Wakely
2020-11-25 10:35 ` Jonathan Wakely
2020-11-25 12:32 ` Jonathan Wakely
2020-11-25 18:39 ` Jonathan Wakely
2020-11-26 16:26 ` Jonathan Wakely
2020-11-23 16:08 ` Jonathan Wakely
2020-09-28 13:30 ` Jonathan Wakely
2020-09-28 13:36 ` Jonathan Wakely
2020-09-28 21:29 ` Thomas Rodgers
2020-09-29 9:44 ` Jonathan Wakely
2020-11-21 23:54 David Edelsohn
2020-11-22 1:27 ` Jonathan Wakely
2020-11-22 12:29 ` Iain Sandoe
2020-11-22 13:37 ` Jonathan Wakely
2020-11-23 18:31 ` Jonathan Wakely
2020-11-23 18:31 ` Jonathan Wakely
2020-11-24 1:48 ` David Edelsohn
2020-11-23 18:30 ` Jonathan Wakely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201123183206.GZ1312820@redhat.com \
--to=jwakely@redhat.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=libstdc++@gcc.gnu.org \
--cc=rodgert@appliantology.com \
--cc=sbergman@redhat.com \
--cc=trodgers@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).