From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jwakely@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [63.128.21.124])
 by sourceware.org (Postfix) with ESMTP id 193CC3833004
 for <gcc-patches@gcc.gnu.org>; Wed, 11 Nov 2020 19:24:11 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 193CC3833004
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-432-QiBv64cSOrq07nwh6UlcOA-1; Wed, 11 Nov 2020 14:24:06 -0500
X-MC-Unique: QiBv64cSOrq07nwh6UlcOA-1
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
 [10.5.11.14])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08E3A5F9D6;
 Wed, 11 Nov 2020 19:24:05 +0000 (UTC)
Received: from localhost (unknown [10.33.36.62])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 9A04A5DA74;
 Wed, 11 Nov 2020 19:24:04 +0000 (UTC)
Date: Wed, 11 Nov 2020 19:24:03 +0000
From: Jonathan Wakely <jwakely@redhat.com>
To: Jakub Jelinek <jakub@redhat.com>
Cc: Florian Weimer <fweimer@redhat.com>, libstdc++@gcc.gnu.org,
 gcc-patches@gcc.gnu.org
Subject: Re: [PATCH] libstdc++: Ensure __gthread_self doesn't call undefined
 weak symbol [PR 95989]
Message-ID: <20201111192403.GY503596@redhat.com>
References: <20201111172442.GA163354@redhat.com> <20201111180822.GR3788@tucnak>
MIME-Version: 1.0
In-Reply-To: <20201111180822.GR3788@tucnak>
X-Clacks-Overhead: GNU Terry Pratchett
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH,
 DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE,
 RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS,
 TXREP autolearn=unavailable autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: gcc-patches@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-patches mailing list <gcc-patches.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>,
 <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Nov 2020 19:24:12 -0000

On 11/11/20 19:08 +0100, Jakub Jelinek via Libstdc++ wrote:
>On Wed, Nov 11, 2020 at 05:24:42PM +0000, Jonathan Wakely wrote:
>> --- a/libgcc/gthr-posix.h
>> +++ b/libgcc/gthr-posix.h
>> @@ -684,7 +684,14 @@ __gthread_equal (__gthread_t __t1, __gthread_t __t2)
>>  static inline __gthread_t
>>  __gthread_self (void)
>>  {
>> +#if __GLIBC_PREREQ(2, 27)
>
>What if it is a non-glibc system where __GLIBC_PREREQ macro isn't defined?

Ah yes, I forgot non-glibc systems exist :-)

Thanks, I'll fix it tomorrow, and test on some more targets.

>I think you'd get then
>error: missing binary operator before token "("
>So I think you want
>#if defined __GLIBC__ && defined __GLIBC_PREREQ
>#if __GLIBC_PREREQ(2, 27)
>  return pthread_self ();
>#else
>  return __gthrw_(pthread_self) ();
>#else
>  return __gthrw_(pthread_self) ();
>#endif
>or similar.
>
>	Jakub
>